Revert "Update VNDK ABI dumps for version 34, x86"

This reverts commit 02d8e33ddb05c397a3ac023bf977df35a44ae109.

Reason for revert: Keep the ABI dumps consistent with the snapshot.

Bug: 330808784
Test: atest vts_vndk_abi_test
Change-Id: I9b3bdddd29e048db09c516e093c32e77e59473c6

153 files changed, 34600 insertions, 22514 deletions

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 64469f70..2f66bb22 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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2936,7 +2936,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "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" : 4278190080,
+     "enum_field_value" : -16777216,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/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 4296c992..a175cf41 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : -281474976710656,
+     "enum_field_value" : 0,
      "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 ec8f536e..c2e730a2 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 dba61206..a0f53a83 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4275,11 +4275,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4860,11 +4860,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 06ddcd07..a7ed66a4 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : -281474976710656,
+     "enum_field_value" : 0,
      "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 4f69495e..9a047be3 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 7a827caf..ebc16fbd 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3447,11 +3447,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 7a13db94..441ecba8 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3464,11 +3464,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4049,11 +4049,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 274d7837..d847e0f4 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 c0a2f08a..96f7e6d5 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3819,11 +3819,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 e8146f3f..508d1c82 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3857,11 +3857,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4442,11 +4442,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 1f47e56b..04cfa8b0 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3953,11 +3953,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4538,11 +4538,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 03b99193..cc3453e5 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.media@1.0.so.lsdump b/34/64/x86/source-based/android.hardware.media@1.0.so.lsdump
index dd8eb56b..2e11995e 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.soundtrigger@2.0.so.lsdump b/34/64/x86/source-based/android.hardware.soundtrigger@2.0.so.lsdump
index 328ef876..da8c2d28 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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3687,7 +3687,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "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" : 4278190080,
+     "enum_field_value" : -16777216,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/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 0c8700da..369083a3 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,31 +963,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -17928,7 +17903,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17937,7 +17912,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17952,7 +17927,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -17961,7 +17936,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17976,7 +17951,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17985,7 +17960,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -18000,7 +17975,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -18009,7 +17984,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -38212,7 +38187,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -42776,7 +42751,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -42816,7 +42791,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -42826,7 +42801,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -42836,7 +42811,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -43632,7 +43607,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -43641,7 +43616,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/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 527ce30e..6a8925ab 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,12 +5945,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/x86/source-based/libRSCpuRef.so.lsdump b/34/64/x86/source-based/libRSCpuRef.so.lsdump
index 852f3e3b..9fa7018a 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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -313,7 +313,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -673,7 +673,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7174,7 +7174,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7456,31 +7456,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -11112,7 +11087,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11130,7 +11105,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11163,7 +11138,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11178,7 +11153,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11196,7 +11171,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11214,7 +11189,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11241,7 +11216,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11277,7 +11252,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11295,7 +11270,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11316,7 +11291,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11340,7 +11315,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11376,7 +11351,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11415,7 +11390,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11451,7 +11426,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11490,7 +11465,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11523,7 +11498,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11541,7 +11516,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11658,7 +11633,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11679,7 +11654,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23781,7 +23756,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23790,7 +23765,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23844,7 +23819,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23862,7 +23837,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23970,7 +23945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23979,7 +23954,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24330,7 +24305,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24339,7 +24314,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24348,7 +24323,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24357,7 +24332,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24366,7 +24341,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24375,7 +24350,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24384,7 +24359,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24402,7 +24377,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24411,7 +24386,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24420,7 +24395,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24429,7 +24404,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24438,7 +24413,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24447,7 +24422,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24456,7 +24431,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24465,7 +24440,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24474,7 +24449,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24483,7 +24458,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24546,7 +24521,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24555,7 +24530,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -25113,7 +25088,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25158,7 +25133,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -25167,7 +25142,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25317,8 +25292,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25767,8 +25742,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -31764,7 +31739,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -31818,7 +31793,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -32534,7 +32509,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -32584,7 +32559,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -32594,7 +32569,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36237,7 +36212,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -37734,7 +37709,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37790,7 +37765,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -38641,7 +38616,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -38977,7 +38952,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -39517,7 +39492,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -39730,7 +39705,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -48091,7 +48066,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48172,7 +48147,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -48947,7 +48922,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48964,7 +48939,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48974,7 +48949,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48991,7 +48966,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -58110,7 +58085,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -58119,7 +58094,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58134,7 +58109,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58143,7 +58118,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58158,7 +58133,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -58167,7 +58142,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58182,7 +58157,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58191,7 +58166,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -129598,7 +129573,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -129607,7 +129582,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -129625,7 +129600,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2>",
+   "name" : "std::__make_tuple_indices<2, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -151252,7 +151227,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -151292,7 +151267,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -151302,7 +151277,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -151312,7 +151287,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -151415,7 +151390,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151529,7 +151504,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151643,7 +151618,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151742,7 +151717,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -152561,7 +152536,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -152570,7 +152545,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/x86/source-based/libRSDriver.so.lsdump b/34/64/x86/source-based/libRSDriver.so.lsdump
index 05325564..d2b55f25 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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6262,31 +6262,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -10629,7 +10604,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10653,7 +10628,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11340,7 +11315,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -26503,8 +26478,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -32449,7 +32424,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -69484,7 +69459,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
diff --git a/34/64/x86/source-based/libRS_internal.so.lsdump b/34/64/x86/source-based/libRS_internal.so.lsdump
index c6334cf9..5b60c9cd 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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8574,31 +8574,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIj"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -31977,7 +31952,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37806,8 +37781,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/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",
+   "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",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -38049,8 +38024,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38058,8 +38033,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38067,8 +38042,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38076,8 +38051,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -74491,7 +74466,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74500,7 +74475,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74515,7 +74490,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74524,7 +74499,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74539,7 +74514,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74548,7 +74523,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74563,7 +74538,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74572,7 +74547,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126026,7 +126001,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139514,7 +139489,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -139657,7 +139632,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147211,7 +147186,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -156536,7 +156511,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -156576,7 +156551,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -156586,7 +156561,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -156596,7 +156571,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -157354,7 +157329,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -157363,7 +157338,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/x86/source-based/libaudioutils.so.lsdump b/34/64/x86/source-based/libaudioutils.so.lsdump
index e4788ee2..b6cb4355 100644
--- a/34/64/x86/source-based/libaudioutils.so.lsdump
+++ b/34/64/x86/source-based/libaudioutils.so.lsdump
@@ -1740,14 +1740,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE25__emplace_unique_key_argsIjJRKNS_4pairIKjS6_EEEEENSK_INS_15__hash_iteratorIPNS_11__hash_nodeIS7_PvEEEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE8__rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112basic_stringIhNS_11char_traitsIhEENS_9allocatorIhEEE21__grow_by_and_replaceEjjjjjjPKh"
   },
   {
@@ -2935,7 +2927,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3173,119 +3165,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 2214592512,
+     "enum_field_value" : -2080374784,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : 2281701376,
+     "enum_field_value" : -2013265920,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : 2281701377,
+     "enum_field_value" : -2013265919,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : 2415919104,
+     "enum_field_value" : -1879048192,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : 2684354560,
+     "enum_field_value" : -1610612736,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3297,15 +3289,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4108,15 +4100,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 3743416319,
+     "enum_field_value" : -551550977,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4598,99 +4590,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : 2147484159,
+     "enum_field_value" : -2147483137,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : 2147484671,
+     "enum_field_value" : -2147482625,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : 2147485695,
+     "enum_field_value" : -2147481601,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : 2147487743,
+     "enum_field_value" : -2147479553,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : 2147491839,
+     "enum_field_value" : -2147475457,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : 2147500031,
+     "enum_field_value" : -2147467265,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : 2147516415,
+     "enum_field_value" : -2147450881,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : 2147549183,
+     "enum_field_value" : -2147418113,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : 2147614719,
+     "enum_field_value" : -2147352577,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : 2147745791,
+     "enum_field_value" : -2147221505,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : 2148007935,
+     "enum_field_value" : -2146959361,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : 2148532223,
+     "enum_field_value" : -2146435073,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : 2149580799,
+     "enum_field_value" : -2145386497,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : 2151677951,
+     "enum_field_value" : -2143289345,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : 2155872255,
+     "enum_field_value" : -2139095041,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : 2164260863,
+     "enum_field_value" : -2130706433,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4706,7 +4698,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5428,7 +5420,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5503,7 +5495,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5524,7 +5516,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -12220,7 +12212,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -13985,7 +13977,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -19135,7 +19127,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/x86/source-based/libbase.so.lsdump b/34/64/x86/source-based/libbase.so.lsdump
index d6f7d7c4..2029f6b2 100644
--- a/34/64/x86/source-based/libbase.so.lsdump
+++ b/34/64/x86/source-based/libbase.so.lsdump
@@ -1074,21 +1074,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -1925,7 +1916,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1976,7 +1967,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2732,7 +2723,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2766,7 +2757,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4915,23 +4906,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -4950,22 +4924,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -4982,22 +4940,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
diff --git a/34/64/x86/source-based/libbinder.so.lsdump b/34/64/x86/source-based/libbinder.so.lsdump
index 8ed4729d..fd167261 100644
--- a/34/64/x86/source-based/libbinder.so.lsdump
+++ b/34/64/x86/source-based/libbinder.so.lsdump
@@ -73,15 +73,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA1_Ds",
-   "name" : "char16_t[1]",
-   "referenced_type" : "_ZTIDs",
-   "self_type" : "_ZTIA1_Ds",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 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]",
@@ -100,6 +91,15 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "linker_set_key" : "_ZTIA20_Ds",
+   "name" : "char16_t[20]",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIA20_Ds",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA20_y",
    "name" : "unsigned long long[20]",
@@ -1064,6 +1064,34 @@
    "name" : "_ZN7android10zeroMemoryEPhj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv"
+  },
+  {
    "name" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE"
   },
   {
@@ -1835,6 +1863,214 @@
    "name" : "_ZN7android2os20ParcelFileDescriptorD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9HeapCacheEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_"
+  },
+  {
    "name" : "_ZN7android33makeDefaultRpcTransportCtxFactoryEv"
   },
   {
@@ -1919,21 +2155,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -2099,6 +2326,22 @@
    "name" : "_ZN7android4base8EndsWithENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEc"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_"
+  },
+  {
    "name" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_"
   },
   {
@@ -2114,6 +2357,22 @@
    "name" : "_ZN7android4base9ParseBoolENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
+  },
+  {
    "name" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj"
   },
   {
@@ -2165,6 +2424,14 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
+  },
+  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2303,9 +2570,6 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
-   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
-  },
-  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2513,9 +2777,6 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
-   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
-  },
-  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3053,9 +3314,6 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
-   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
-  },
-  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3266,10 +3524,7 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
-  },
-  {
-   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3587,6 +3842,22 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
+  },
+  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3716,9 +3987,6 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
-   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
-  },
-  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3737,6 +4005,14 @@
    "name" : "_ZNK7android6Parcel16readStrongBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3920,6 +4196,198 @@
    "name" : "_ZNK7android6Parcel9readInt64Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+  },
+  {
    "name" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE"
   },
   {
@@ -4026,10 +4494,406 @@
   },
   {
    "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_"
   },
   {
@@ -4038,9 +4902,1329 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE8overflowEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9pbackfailEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9underflowEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS1_2os17PersistableBundleENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S4_EEEEEixERS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIS2_NS_9allocatorIS2_EEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ES2_NS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S2_EEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EbNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_bEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EdNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_dEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EiNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_iEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ExNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_xEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_11__thread_idENS_6threadENS_4lessIS1_EENS_9allocatorINS_4pairIKS1_S2_EEEEEixEOS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceENS_4lessIS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINS9_15IServiceManager25LocalRegistrationCallbackEEENSA_INS9_18ServiceManagerShim18RegistrationWaiterEEEEENS4_ISH_EEEENS_4lessIS6_EENS4_INS8_IKS6_SJ_EEEEEixERSM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__construct_nodeIJRS5_EEENS_10unique_ptrINS_11__tree_nodeIS5_PvEENS_22__tree_node_destructorINS8_ISG_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSF_SF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE25__emplace_unique_key_argsIS5_JRS5_EEENS_4pairINS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE12__find_equalIS2_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISC_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSC_SC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE25__emplace_unique_key_argsIS2_JRKS2_EEENS_4pairINS_15__tree_iteratorIS2_PNS_11__tree_nodeIS2_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISK_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS5_JNS_4pairIKS5_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE4findIS5_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SG_EEiEERPNS_15__tree_end_nodeISI_EESJ_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISI_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE15__emplace_multiIJRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISQ_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_4pairIKS3_S5_EEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISN_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSI_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SO_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE8__detachEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_4pairIKS3_S3_EEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISL_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE13__move_assignERSB_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS2_JRKNS_21piecewise_construct_tENS_5tupleIJOS2_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSO_SO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISW_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSW_SW_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSW_IJEEEEEENS9_INS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE4findIS7_EENS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE5eraseENS_21__tree_const_iteratorISL_PNS_11__tree_nodeISL_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE7destroyEPNS_11__tree_nodeISL_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE13__lower_boundIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_SM_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISK_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE25__emplace_unique_key_argsIS5_JRKNS_21piecewise_construct_tENS_5tupleIJRKS5_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE4findIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE5eraseENS_21__tree_const_iteratorISA_PNS_11__tree_nodeISA_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE7destroyEPNS_11__tree_nodeISA_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSH_SH_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsIyJNS_4pairIKyS4_EEEEENSE_INS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE24__emplace_back_slow_pathIJDsEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE26__swap_out_circular_bufferERNS_14__split_bufferIDsRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE21__push_back_slow_pathIRKS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSessionEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6assignIPS2_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS2_NS_15iterator_traitsIS9_E9referenceEEE5valueEvE4typeES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIS6_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE21__push_back_slow_pathISA_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE26__swap_out_circular_bufferERNS_14__split_bufferISA_RSC_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE21__push_back_slow_pathIS8_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE24__emplace_back_slow_pathIJS6_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RSA_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE12__move_rangeEPS1_S5_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertENS_11__wrap_iterIPKS1_EEjRS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPKS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS9_E9referenceEEE5valueENS_11__wrap_iterIPS1_EEE4typeENSD_IS7_EES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIS6_EEE4typeENSC_IPKS1_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE9push_backERKb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6assignIPdEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIdNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE26__swap_out_circular_bufferERNS_14__split_bufferIfRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6assignIPiEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIRKjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE26__swap_out_circular_bufferERNS_14__split_bufferIjRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE26__swap_out_circular_bufferERNS_14__split_bufferIyRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__19__sift_upIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "_ZThn4_N7android10AllocationD0Ev"
   },
   {
@@ -4302,9 +6486,15 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
+   "name" : "_ZN7android16kEnableRecordingE"
+  },
+  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
+   "name" : "_ZN7android20kEnableRpcDevServersE"
+  },
+  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -4741,6 +6931,10 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android10PoolThreadE"
+  },
+  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -4768,6 +6962,10 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android15BpShellCallbackE"
+  },
+  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -4777,6 +6975,14 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android16BpResultReceiverE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
+  },
+  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -4840,6 +7046,14 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -4908,10 +7122,6 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTVN7android15RpcTransportRawE"
-  },
-  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -4935,10 +7145,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android18RpcTransportCtxRawE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -6473,7 +8679,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -6524,7 +8730,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -10911,6 +13117,104 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemoryHeap>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IShellCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IResultReceiver>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IClientCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceManager>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemory>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
    "function_name" : "android::IMemoryHeap::asInterface",
    "linker_set_key" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE",
    "parameters" :
@@ -13396,6 +15700,849 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::WaitForShutdownListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession23WaitForShutdownListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_12ProcessStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12ProcessStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_12ProcessStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15BpShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android15BpShellCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_16BpResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android16BpResultReceiverE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager::LocalRegistrationCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShimEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android18ServiceManagerShimE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::BufferedTextOutput::BufferState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18BufferedTextOutput11BufferStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os17BpServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os17BpServiceCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::binder::internal::ClientCounterCallbackImpl>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7BBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::clear",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpBinderE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android10AllocationE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpMemoryE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::HeapCache>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_9HeapCacheEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9HeapCacheEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::clear",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h",
+   "template_args" :
+   [
+    "_ZTIN7android10RpcSession23WaitForShutdownListenerE"
+   ]
+  },
+  {
+   "function_name" : "android::wp<android::IBinder::DeathRecipient>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinder14DeathRecipientEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinder14DeathRecipientEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinder14DeathRecipientEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::base::LogMessage::stream",
    "linker_set_key" : "_ZN7android4base10LogMessage6streamEv",
    "parameters" :
@@ -13917,23 +17064,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -13952,22 +17082,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -13984,22 +17098,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
@@ -14648,6 +17746,114 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIa"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIs"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
    "function_name" : "android::base::Readlink",
    "linker_set_key" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_",
    "parameters" :
@@ -14720,6 +17926,114 @@
    "source_file" : "system/libbase/include/android-base/parsebool.h"
   },
   {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIh"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIj"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIt"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::base::ReadFully",
    "linker_set_key" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj",
    "parameters" :
@@ -15000,6 +18314,48 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIxEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIyEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::writeCString",
    "linker_set_key" : "_ZN7android6Parcel12writeCStringEPKc",
    "parameters" :
@@ -15745,19 +19101,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::setServiceFuzzing",
-   "linker_set_key" : "_ZN7android6Parcel17setServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::writeDoubleVector",
    "linker_set_key" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -16865,12 +20208,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
   },
   {
-   "function_name" : "android::binder::LazyServiceRegistrar::createExtraTestInstance",
-   "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv",
-   "return_type" : "_ZTIN7android6binder20LazyServiceRegistrarE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
-  },
-  {
    "function_name" : "android::binder::LazyServiceRegistrar::setActiveServicesCallback",
    "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE",
    "parameters" :
@@ -17665,7 +21002,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -17679,7 +21015,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -19480,7 +22815,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIb",
+   "return_type" : "_ZTIv",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -19626,7 +22961,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -19634,23 +22969,7 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "function_name" : "android::RpcServer::setServerSocketModifier",
-   "linker_set_key" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android9RpcServerE"
-    },
-    {
-     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21566,19 +24885,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::isServiceFuzzing",
-   "linker_set_key" : "_ZNK7android6Parcel16isServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPKN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::readDoubleVector",
    "linker_set_key" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -21669,6 +24975,46 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os15IClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16IServiceCallbackE"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::readUint64Vector",
    "linker_set_key" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -22617,6 +25963,1062 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "function_name" : "android::binder::debug::RecordedTransaction::dumpToFile",
    "linker_set_key" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE",
    "parameters" :
@@ -23447,10 +27849,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA1_KDs",
-   "name" : "const char16_t (&)[1]",
-   "referenced_type" : "_ZTIA1_KDs",
-   "self_type" : "_ZTIRA1_KDs",
+   "linker_set_key" : "_ZTIRA20_KDs",
+   "name" : "const char16_t (&)[20]",
+   "referenced_type" : "_ZTIA20_KDs",
+   "self_type" : "_ZTIRA20_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -23656,7 +28058,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_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -24356,10 +28758,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -26368,8 +30770,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_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",
+   "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",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29012,10 +33414,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -29696,15 +34098,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession> *",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android2wpINS_7BBinderEEE",
    "name" : "android::wp<android::BBinder> *",
    "referenced_type" : "_ZTIN7android2wpINS_7BBinderEEE",
@@ -30335,10 +34728,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -31171,16 +35564,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA1_KDs",
-   "name" : "const char16_t[1]",
-   "referenced_type" : "_ZTIA1_Ds",
-   "self_type" : "_ZTIA1_KDs",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA1_KPKc",
@@ -31191,6 +35574,16 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIA20_KDs",
+   "name" : "const char16_t[20]",
+   "referenced_type" : "_ZTIA20_Ds",
+   "self_type" : "_ZTIA20_KDs",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Ky",
@@ -33439,11 +37832,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -33563,7 +37956,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -34964,46 +39357,6 @@
      "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android15RpcTransportRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportCtxRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android18RpcTransportCtxRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
    "name" : "libutilsinternal::is_complete_type<android::Parcel, void>",
    "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
@@ -46081,15 +50434,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "size" : 12,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "size" : 48,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -49560,7 +53913,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "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"
+     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_x86_shared/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -49610,34 +53963,6 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android10RpcSessionE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android7RefBase12weakref_typeE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android10RpcSessionE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "_ZTIPN7android7BBinderE"
     },
     {
@@ -57120,12 +61445,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -59227,14 +63546,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA1_Ds"
+     "referenced_type" : "_ZTIA20_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -59676,7 +63995,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -59686,32 +64005,26 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServerSocketModifier",
-     "field_offset" : 960,
-     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
-    },
-    {
-     "access" : "private",
      "field_name" : "mSessions",
-     "field_offset" : 1152,
+     "field_offset" : 960,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1248,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1280,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1344,
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -59720,12 +64033,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 192,
+     "component_value" : 168,
      "kind" : "vbase_offset"
     },
     {
@@ -59762,11 +64075,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "offset_to_top"
     },
     {
@@ -60913,10 +65226,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "name" : "std::function<sp<IBinder> (wp<RpcSession>, const void *, unsigned int)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
+   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "name" : "std::function<sp<IBinder> (const void *, unsigned int)> &&",
+   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -60949,15 +65262,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "name" : "std::function<void (borrowed_fd)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "self_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "name" : "std::function<void (LogId, LogSeverity, const char *, const char *, unsigned int, const char *)> &&",
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
diff --git a/34/64/x86/source-based/libc++.so.lsdump b/34/64/x86/source-based/libc++.so.lsdump
index 19ea3cb5..dcc4a65c 100644
--- a/34/64/x86/source-based/libc++.so.lsdump
+++ b/34/64/x86/source-based/libc++.so.lsdump
@@ -2594,6 +2594,14 @@
    "name" : "_ZNSt3__112__next_primeEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__112__rs_defaultC1ERKS0_"
   },
   {
@@ -4396,10 +4404,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_"
   },
   {
@@ -4415,6 +4447,22 @@
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIssEEPsEEvT0_S5_T_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_"
+  },
+  {
    "name" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE"
   },
   {
@@ -4590,6 +4638,10 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
+  },
+  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -4978,10 +5030,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_"
   },
   {
@@ -4998,10 +5074,50 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_"
   },
   {
@@ -5018,6 +5134,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_"
   },
   {
@@ -9794,7 +9926,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_grouping",
+   "function_name" : "std::moneypunct<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9808,7 +9940,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_neg_format",
+   "function_name" : "std::moneypunct<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9822,7 +9954,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_pos_format",
+   "function_name" : "std::moneypunct<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9836,7 +9968,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9850,7 +9982,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_frac_digits",
+   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9864,7 +9996,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_decimal_point",
+   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -9878,7 +10010,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_negative_sign",
+   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -9892,7 +10024,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_positive_sign",
+   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -9906,7 +10038,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10046,7 +10178,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10060,7 +10192,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10074,7 +10206,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10088,7 +10220,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10102,7 +10234,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10116,7 +10248,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10130,7 +10262,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10144,7 +10276,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10158,7 +10290,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13077,7 +13209,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13091,7 +13223,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13105,7 +13237,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13119,7 +13251,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13133,7 +13265,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13147,7 +13279,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13161,7 +13293,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13175,7 +13307,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13189,7 +13321,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13329,7 +13461,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13343,7 +13475,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13357,7 +13489,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13371,7 +13503,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13385,7 +13517,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13399,7 +13531,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13413,7 +13545,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13427,7 +13559,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13441,7 +13573,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20172,6 +20304,50 @@
    "source_file" : "external/libcxx/include/__hash_table"
   },
   {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPcEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPcEE"
+   ]
+  },
+  {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__rs_default::__rs_default",
    "linker_set_key" : "_ZNSt3__112__rs_defaultC1ERKS0_",
    "parameters" :
@@ -28352,7 +28528,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char>::init",
+   "function_name" : "std::moneypunct_byname<char, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28386,7 +28562,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28420,6 +28596,121 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_",
    "parameters" :
    [
@@ -28443,6 +28734,29 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_",
    "parameters" :
    [
@@ -28534,6 +28848,98 @@
    ]
   },
   {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "access" : "private",
    "function_name" : "std::__time_get_storage<char>::init",
    "linker_set_key" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE",
@@ -29345,6 +29751,19 @@
    "source_file" : "external/libcxx/include/memory"
   },
   {
+   "function_name" : "std::mersenne_twister_engine<unsigned int, 32, 624, 397, 31, 2567483615, 11, 4294967295, 7, 2636928640, 15, 4022730752, 18, 1812433253>::operator()",
+   "linker_set_key" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/random"
+  },
+  {
    "function_name" : "std::__libcpp_debug_exception::__libcpp_debug_exception",
    "linker_set_key" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE",
    "parameters" :
@@ -31385,6 +31804,136 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31411,6 +31960,32 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31514,6 +32089,255 @@
    ]
   },
   {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
    "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_",
    "parameters" :
@@ -31544,6 +32368,35 @@
   },
   {
    "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_",
    "parameters" :
    [
@@ -31659,6 +32512,122 @@
    ]
   },
   {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "function_name" : "std::__sort5",
    "linker_set_key" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_",
    "parameters" :
@@ -34543,13 +35512,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char>::id",
+   "name" : "std::moneypunct<char, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char>::intl",
+   "name" : "std::moneypunct<char, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -34567,13 +35536,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t>::id",
+   "name" : "std::moneypunct<wchar_t, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t>::intl",
+   "name" : "std::moneypunct<wchar_t, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -54102,7 +55071,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54111,7 +55080,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54126,7 +55095,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54135,7 +55104,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54150,7 +55119,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54159,7 +55128,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54174,7 +55143,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54183,7 +55152,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -114291,7 +115260,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -114300,7 +115269,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -134555,7 +135524,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -134565,7 +135534,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000>",
+   "name" : "std::ratio<1000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -134605,7 +135574,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -134615,7 +135584,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -134625,7 +135594,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -135737,7 +136706,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -135746,7 +136715,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135755,7 +136724,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "size" : 1,
@@ -135769,7 +136738,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135778,7 +136747,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135815,7 +136784,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135824,7 +136793,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135861,7 +136830,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135870,7 +136839,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135907,7 +136876,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135916,7 +136885,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135953,7 +136922,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135962,7 +136931,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135999,7 +136968,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -136008,7 +136977,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136077,7 +137046,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "size" : 1,
@@ -136086,7 +137055,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136201,7 +137170,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136210,7 +137179,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
diff --git a/34/64/x86/source-based/libcap.so.lsdump b/34/64/x86/source-based/libcap.so.lsdump
index 0a44b6b8..2ccfa70f 100644
--- a/34/64/x86/source-based/libcap.so.lsdump
+++ b/34/64/x86/source-based/libcap.so.lsdump
@@ -49,6 +49,9 @@
  "elf_functions" :
  [
   {
+   "name" : "_libcap_strdup"
+  },
+  {
    "name" : "cap_clear"
   },
   {
@@ -76,9 +79,6 @@
    "name" : "cap_fill"
   },
   {
-   "name" : "cap_fill_flag"
-  },
-  {
    "name" : "cap_free"
   },
   {
@@ -121,21 +121,12 @@
    "name" : "cap_get_secbits"
   },
   {
-   "name" : "cap_iab_compare"
-  },
-  {
-   "name" : "cap_iab_dup"
-  },
-  {
    "name" : "cap_iab_fill"
   },
   {
    "name" : "cap_iab_from_text"
   },
   {
-   "name" : "cap_iab_get_pid"
-  },
-  {
    "name" : "cap_iab_get_proc"
   },
   {
@@ -193,9 +184,6 @@
    "name" : "cap_prctlw"
   },
   {
-   "name" : "cap_proc_root"
-  },
-  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -533,27 +521,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_fill_flag",
-   "linker_set_key" : "cap_fill_flag",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    },
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_free",
    "linker_set_key" : "cap_free",
    "parameters" :
@@ -716,33 +683,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_compare",
-   "linker_set_key" : "cap_iab_compare",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    },
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
-   "function_name" : "cap_iab_dup",
-   "linker_set_key" : "cap_iab_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_fill",
    "linker_set_key" : "cap_iab_fill",
    "parameters" :
@@ -776,18 +716,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_get_pid",
-   "linker_set_key" : "cap_iab_get_pid",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_get_proc",
    "linker_set_key" : "cap_iab_get_proc",
    "return_type" : "_ZTIP9cap_iab_s",
@@ -895,7 +823,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -910,7 +838,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -940,7 +868,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -961,7 +889,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -976,7 +904,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1070,18 +998,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_proc_root",
-   "linker_set_key" : "cap_proc_root",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPc",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_reset_ambient",
    "linker_set_key" : "cap_reset_ambient",
    "return_type" : "_ZTIi",
diff --git a/34/64/x86/source-based/libcodec2.so.lsdump b/34/64/x86/source-based/libcodec2.so.lsdump
index 0c8f2c7f..567752be 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1268,7 +1268,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/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" : 18446744073709551600,
+     "enum_field_value" : -16,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3618,7 +3618,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3976,7 +3976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4280,11 +4280,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6756,7 +6756,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6765,7 +6765,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6945,7 +6945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7017,7 +7017,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7224,7 +7224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7233,7 +7233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7242,7 +7242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7251,7 +7251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7260,7 +7260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7269,7 +7269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7278,7 +7278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7449,7 +7449,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7494,7 +7494,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7782,7 +7782,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7791,7 +7791,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7800,7 +7800,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -8165,7 +8165,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8225,7 +8225,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8275,7 +8275,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9020,7 +9020,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9076,7 +9076,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9560,7 +9560,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10028,7 +10028,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10620,7 +10620,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10987,7 +10987,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86/source-based/libcrypto.so.lsdump b/34/64/x86/source-based/libcrypto.so.lsdump
index cb84b572..a2af4536 100644
--- a/34/64/x86/source-based/libcrypto.so.lsdump
+++ b/34/64/x86/source-based/libcrypto.so.lsdump
@@ -38,6 +38,15 @@
    "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]",
@@ -111,11 +120,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -603,9 +612,6 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
-   "name" : "ASN1_TIME_set_string_X509"
-  },
-  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1857,6 +1863,18 @@
    "name" : "CRYPTO_MUTEX_unlock_write"
   },
   {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_write"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_write"
+  },
+  {
    "name" : "CRYPTO_THREADID_current"
   },
   {
@@ -2598,18 +2616,6 @@
    "name" : "EC_get_builtin_curves"
   },
   {
-   "name" : "EC_group_p224"
-  },
-  {
-   "name" : "EC_group_p256"
-  },
-  {
-   "name" : "EC_group_p384"
-  },
-  {
-   "name" : "EC_group_p521"
-  },
-  {
    "name" : "EC_hash_to_curve_p256_xmd_sha256_sswu"
   },
   {
@@ -3066,15 +3072,6 @@
    "name" : "EVP_HPKE_CTX_seal"
   },
   {
-   "name" : "EVP_HPKE_CTX_setup_auth_recipient"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing"
-  },
-  {
    "name" : "EVP_HPKE_CTX_setup_recipient"
   },
   {
@@ -3510,9 +3507,6 @@
    "name" : "EVP_aead_aes_128_cbc_sha1_tls_implicit_iv"
   },
   {
-   "name" : "EVP_aead_aes_128_cbc_sha256_tls"
-  },
-  {
    "name" : "EVP_aead_aes_128_ccm_bluetooth"
   },
   {
@@ -3732,9 +3726,6 @@
    "name" : "EVP_sha256"
   },
   {
-   "name" : "EVP_sha256_final_with_secret_suffix"
-  },
-  {
    "name" : "EVP_sha384"
   },
   {
@@ -4179,69 +4170,6 @@
    "name" : "OPENSSL_secure_malloc"
   },
   {
-   "name" : "OPENSSL_sk_deep_copy"
-  },
-  {
-   "name" : "OPENSSL_sk_delete"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_if"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_ptr"
-  },
-  {
-   "name" : "OPENSSL_sk_dup"
-  },
-  {
-   "name" : "OPENSSL_sk_find"
-  },
-  {
-   "name" : "OPENSSL_sk_free"
-  },
-  {
-   "name" : "OPENSSL_sk_insert"
-  },
-  {
-   "name" : "OPENSSL_sk_is_sorted"
-  },
-  {
-   "name" : "OPENSSL_sk_new"
-  },
-  {
-   "name" : "OPENSSL_sk_new_null"
-  },
-  {
-   "name" : "OPENSSL_sk_num"
-  },
-  {
-   "name" : "OPENSSL_sk_pop"
-  },
-  {
-   "name" : "OPENSSL_sk_pop_free_ex"
-  },
-  {
-   "name" : "OPENSSL_sk_push"
-  },
-  {
-   "name" : "OPENSSL_sk_set"
-  },
-  {
-   "name" : "OPENSSL_sk_set_cmp_func"
-  },
-  {
-   "name" : "OPENSSL_sk_shift"
-  },
-  {
-   "name" : "OPENSSL_sk_sort"
-  },
-  {
-   "name" : "OPENSSL_sk_value"
-  },
-  {
-   "name" : "OPENSSL_sk_zero"
-  },
-  {
    "name" : "OPENSSL_strcasecmp"
   },
   {
@@ -4848,27 +4776,6 @@
    "name" : "RSA_new_method"
   },
   {
-   "name" : "RSA_new_method_no_e"
-  },
-  {
-   "name" : "RSA_new_private_key"
-  },
-  {
-   "name" : "RSA_new_private_key_large_e"
-  },
-  {
-   "name" : "RSA_new_private_key_no_crt"
-  },
-  {
-   "name" : "RSA_new_private_key_no_e"
-  },
-  {
-   "name" : "RSA_new_public_key"
-  },
-  {
-   "name" : "RSA_new_public_key_large_e"
-  },
-  {
    "name" : "RSA_padding_add_PKCS1_OAEP_mgf1"
   },
   {
@@ -7458,9 +7365,36 @@
    "name" : "s2i_ASN1_OCTET_STRING"
   },
   {
+   "name" : "sk_deep_copy"
+  },
+  {
+   "name" : "sk_delete"
+  },
+  {
+   "name" : "sk_delete_if"
+  },
+  {
+   "name" : "sk_delete_ptr"
+  },
+  {
+   "name" : "sk_dup"
+  },
+  {
+   "name" : "sk_find"
+  },
+  {
    "name" : "sk_free"
   },
   {
+   "name" : "sk_insert"
+  },
+  {
+   "name" : "sk_is_sorted"
+  },
+  {
+   "name" : "sk_new"
+  },
+  {
    "name" : "sk_new_null"
   },
   {
@@ -7479,9 +7413,24 @@
    "name" : "sk_push"
   },
   {
+   "name" : "sk_set"
+  },
+  {
+   "name" : "sk_set_cmp_func"
+  },
+  {
+   "name" : "sk_shift"
+  },
+  {
+   "name" : "sk_sort"
+  },
+  {
    "name" : "sk_value"
   },
   {
+   "name" : "sk_zero"
+  },
+  {
    "name" : "v2i_GENERAL_NAME"
   },
   {
@@ -8546,23 +8495,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8926,30 +8875,6 @@
      "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
     },
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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"
     },
     {
@@ -10450,21 +10375,6 @@
    "source_file" : "external/boringssl/src/include/openssl/asn1.h"
   },
   {
-   "function_name" : "ASN1_TIME_set_string_X509",
-   "linker_set_key" : "ASN1_TIME_set_string_X509",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
    "function_name" : "ASN1_TIME_to_generalizedtime",
    "linker_set_key" : "ASN1_TIME_to_generalizedtime",
    "parameters" :
@@ -16342,21 +16252,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
-   "function_name" : "EC_get_builtin_curves",
-   "linker_set_key" : "EC_get_builtin_curves",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP16EC_builtin_curve"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
    "function_name" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "linker_set_key" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "parameters" :
@@ -17416,135 +17311,6 @@
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
    "function_name" : "EVP_HPKE_CTX_setup_recipient",
    "linker_set_key" : "EVP_HPKE_CTX_setup_recipient",
    "parameters" :
@@ -19429,12 +19195,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "linker_set_key" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -20959,318 +20719,6 @@
    "source_file" : "external/boringssl/src/include/openssl/mem.h"
   },
   {
-   "function_name" : "OPENSSL_sk_deep_copy",
-   "linker_set_key" : "OPENSSL_sk_deep_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPKvE"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete",
-   "linker_set_key" : "OPENSSL_sk_delete",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_if",
-   "linker_set_key" : "OPENSSL_sk_delete_if",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPvS_E"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_ptr",
-   "linker_set_key" : "OPENSSL_sk_delete_ptr",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_dup",
-   "linker_set_key" : "OPENSSL_sk_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_find",
-   "linker_set_key" : "OPENSSL_sk_find",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_free",
-   "linker_set_key" : "OPENSSL_sk_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_insert",
-   "linker_set_key" : "OPENSSL_sk_insert",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_is_sorted",
-   "linker_set_key" : "OPENSSL_sk_is_sorted",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new",
-   "linker_set_key" : "OPENSSL_sk_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new_null",
-   "linker_set_key" : "OPENSSL_sk_new_null",
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_num",
-   "linker_set_key" : "OPENSSL_sk_num",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop",
-   "linker_set_key" : "OPENSSL_sk_pop",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop_free_ex",
-   "linker_set_key" : "OPENSSL_sk_pop_free_ex",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_push",
-   "linker_set_key" : "OPENSSL_sk_push",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set",
-   "linker_set_key" : "OPENSSL_sk_set",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set_cmp_func",
-   "linker_set_key" : "OPENSSL_sk_set_cmp_func",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIPFiPKPKvS2_E",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_shift",
-   "linker_set_key" : "OPENSSL_sk_shift",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_sort",
-   "linker_set_key" : "OPENSSL_sk_sort",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_value",
-   "linker_set_key" : "OPENSSL_sk_value",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_zero",
-   "linker_set_key" : "OPENSSL_sk_zero",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
    "function_name" : "OPENSSL_strcasecmp",
    "linker_set_key" : "OPENSSL_strcasecmp",
    "parameters" :
@@ -27786,10 +27234,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27858,7 +27306,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29874,7 +29322,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30663,7 +30111,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31908,7 +31356,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31929,7 +31377,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -36283,6 +35731,114 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
+   "function_name" : "sk_deep_copy",
+   "linker_set_key" : "sk_deep_copy",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPKvE"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPFvPvES_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPvE"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete",
+   "linker_set_key" : "sk_delete",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_if",
+   "linker_set_key" : "sk_delete_if",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPvS_E"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_ptr",
+   "linker_set_key" : "sk_delete_ptr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_dup",
+   "linker_set_key" : "sk_dup",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_find",
+   "linker_set_key" : "sk_find",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_free",
    "linker_set_key" : "sk_free",
    "parameters" :
@@ -36295,6 +35851,48 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_insert",
+   "linker_set_key" : "sk_insert",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_is_sorted",
+   "linker_set_key" : "sk_is_sorted",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_new",
+   "linker_set_key" : "sk_new",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_new_null",
    "linker_set_key" : "sk_new_null",
    "return_type" : "_ZTIP8stack_st",
@@ -36373,6 +35971,66 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_set",
+   "linker_set_key" : "sk_set",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_set_cmp_func",
+   "linker_set_key" : "sk_set_cmp_func",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIPFiPKPKvS2_E",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_shift",
+   "linker_set_key" : "sk_shift",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_sort",
+   "linker_set_key" : "sk_sort",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_value",
    "linker_set_key" : "sk_value",
    "parameters" :
@@ -36388,6 +36046,18 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_zero",
+   "linker_set_key" : "sk_zero",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "v2i_GENERAL_NAME",
    "linker_set_key" : "v2i_GENERAL_NAME",
    "parameters" :
@@ -37218,6 +36888,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
+   "name" : "bn_mont_ctx_st *",
+   "referenced_type" : "_ZTI14bn_mont_ctx_st",
+   "self_type" : "_ZTIP14bn_mont_ctx_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14private_key_st",
    "name" : "private_key_st *",
    "referenced_type" : "_ZTI14private_key_st",
@@ -37335,15 +37023,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP16EC_builtin_curve",
-   "name" : "EC_builtin_curve *",
-   "referenced_type" : "_ZTI16EC_builtin_curve",
-   "self_type" : "_ZTIP16EC_builtin_curve",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP16HRSS_private_key",
    "name" : "HRSS_private_key *",
    "referenced_type" : "_ZTI16HRSS_private_key",
@@ -38235,10 +37914,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *, const void *)",
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "self_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
+   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38390,15 +38069,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
    "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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,
@@ -38669,15 +38339,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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,
@@ -39459,21 +39120,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKl",
-   "name" : "const long *",
-   "referenced_type" : "_ZTIKl",
-   "self_type" : "_ZTIPKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -39675,6 +39327,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14trust_token_st",
    "name" : "trust_token_st **",
    "referenced_type" : "_ZTIP14trust_token_st",
@@ -40076,7 +39737,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40148,7 +39809,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/bio.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40228,7 +39889,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 480,
+   "size" : 344,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40550,7 +40211,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40570,7 +40231,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 44,
+   "size" : 36,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40970,15 +40631,17 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 76,
+   "size" : 84,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
+   "alignment" : 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"
   },
   {
@@ -41100,22 +40763,12 @@
    "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKl",
-   "name" : "const long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -41368,42 +41021,6 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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"
     },
     {
@@ -42553,7 +42170,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4544,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42561,7 +42178,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42589,22 +42206,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4672,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5376,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5440,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42612,7 +42229,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42905,7 +42522,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIA128_h"
+     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
     },
     {
      "field_name" : "block_used",
@@ -43435,7 +43052,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -43447,7 +43064,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 564,
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43636,6 +43253,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 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"
     },
@@ -43916,6 +43776,28 @@
    "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 a9ad8f02..0db506ff 100644
--- a/34/64/x86/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/x86/source-based/libcrypto_utils.so.lsdump
@@ -137,11 +137,13 @@
  "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 c4b359a6..512f1871 100644
--- a/34/64/x86/source-based/libcurl.so.lsdump
+++ b/34/64/x86/source-based/libcurl.so.lsdump
@@ -111,6 +111,12 @@
    "name" : "Curl_all_content_encodings"
   },
   {
+   "name" : "Curl_alpn_get_proxy_spec"
+  },
+  {
+   "name" : "Curl_alpn_get_spec"
+  },
+  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -201,81 +207,9 @@
    "name" : "Curl_base64url_encode"
   },
   {
-   "name" : "Curl_bufcp_free"
-  },
-  {
-   "name" : "Curl_bufcp_init"
-  },
-  {
-   "name" : "Curl_bufcp_put"
-  },
-  {
-   "name" : "Curl_bufcp_take"
-  },
-  {
    "name" : "Curl_buffer_send"
   },
   {
-   "name" : "Curl_bufq_free"
-  },
-  {
-   "name" : "Curl_bufq_init"
-  },
-  {
-   "name" : "Curl_bufq_init2"
-  },
-  {
-   "name" : "Curl_bufq_initp"
-  },
-  {
-   "name" : "Curl_bufq_is_empty"
-  },
-  {
-   "name" : "Curl_bufq_is_full"
-  },
-  {
-   "name" : "Curl_bufq_len"
-  },
-  {
-   "name" : "Curl_bufq_pass"
-  },
-  {
-   "name" : "Curl_bufq_peek"
-  },
-  {
-   "name" : "Curl_bufq_peek_at"
-  },
-  {
-   "name" : "Curl_bufq_read"
-  },
-  {
-   "name" : "Curl_bufq_reset"
-  },
-  {
-   "name" : "Curl_bufq_sipn"
-  },
-  {
-   "name" : "Curl_bufq_skip"
-  },
-  {
-   "name" : "Curl_bufq_skip_and_shift"
-  },
-  {
-   "name" : "Curl_bufq_slurp"
-  },
-  {
-   "name" : "Curl_bufq_slurpn"
-  },
-  {
-   "name" : "Curl_bufq_space"
-  },
-  {
-   "name" : "Curl_bufq_write"
-  },
-  {
-   "name" : "Curl_bufq_write_pass"
-  },
-  {
    "name" : "Curl_bufref_free"
   },
   {
@@ -345,9 +279,6 @@
    "name" : "Curl_cf_def_send"
   },
   {
-   "name" : "Curl_cf_h1_proxy_insert_after"
-  },
-  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -360,9 +291,6 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
-   "name" : "Curl_cf_http_proxy_get_host"
-  },
-  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -438,13 +366,13 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard_all"
+   "name" : "Curl_conn_cf_discard"
   },
   {
-   "name" : "Curl_conn_cf_discard_chain"
+   "name" : "Curl_conn_cf_discard_all"
   },
   {
-   "name" : "Curl_conn_cf_discard_sub"
+   "name" : "Curl_conn_cf_discard_chain"
   },
   {
    "name" : "Curl_conn_cf_get_select_socks"
@@ -456,9 +384,6 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
-   "name" : "Curl_conn_cf_is_ssl"
-  },
-  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -513,6 +438,9 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
+   "name" : "Curl_conn_http_proxy_add"
+  },
+  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -681,72 +609,6 @@
    "name" : "Curl_dyn_vprintf"
   },
   {
-   "name" : "Curl_dynhds_add"
-  },
-  {
-   "name" : "Curl_dynhds_add_custom"
-  },
-  {
-   "name" : "Curl_dynhds_cadd"
-  },
-  {
-   "name" : "Curl_dynhds_ccontains"
-  },
-  {
-   "name" : "Curl_dynhds_ccount_name"
-  },
-  {
-   "name" : "Curl_dynhds_cget"
-  },
-  {
-   "name" : "Curl_dynhds_contains"
-  },
-  {
-   "name" : "Curl_dynhds_count"
-  },
-  {
-   "name" : "Curl_dynhds_count_name"
-  },
-  {
-   "name" : "Curl_dynhds_cremove"
-  },
-  {
-   "name" : "Curl_dynhds_cset"
-  },
-  {
-   "name" : "Curl_dynhds_free"
-  },
-  {
-   "name" : "Curl_dynhds_get"
-  },
-  {
-   "name" : "Curl_dynhds_getn"
-  },
-  {
-   "name" : "Curl_dynhds_h1_add_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_cadd_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_dprint"
-  },
-  {
-   "name" : "Curl_dynhds_init"
-  },
-  {
-   "name" : "Curl_dynhds_remove"
-  },
-  {
-   "name" : "Curl_dynhds_reset"
-  },
-  {
-   "name" : "Curl_dynhds_set"
-  },
-  {
-   "name" : "Curl_dynhds_set_opts"
-  },
-  {
    "name" : "Curl_expire"
   },
   {
@@ -819,15 +681,6 @@
    "name" : "Curl_gmtime"
   },
   {
-   "name" : "Curl_h1_req_parse_free"
-  },
-  {
-   "name" : "Curl_h1_req_parse_init"
-  },
-  {
-   "name" : "Curl_h1_req_parse_read"
-  },
-  {
    "name" : "Curl_hash_add"
   },
   {
@@ -930,9 +783,6 @@
    "name" : "Curl_http_cookies"
   },
   {
-   "name" : "Curl_http_decode_status"
-  },
-  {
    "name" : "Curl_http_done"
   },
   {
@@ -960,24 +810,6 @@
    "name" : "Curl_http_readwrite_headers"
   },
   {
-   "name" : "Curl_http_req_free"
-  },
-  {
-   "name" : "Curl_http_req_make"
-  },
-  {
-   "name" : "Curl_http_req_make2"
-  },
-  {
-   "name" : "Curl_http_req_to_h2"
-  },
-  {
-   "name" : "Curl_http_resp_free"
-  },
-  {
-   "name" : "Curl_http_resp_make"
-  },
-  {
    "name" : "Curl_http_resume"
   },
   {
@@ -1653,9 +1485,6 @@
    "name" : "Curl_updatesocket"
   },
   {
-   "name" : "Curl_url_set_authority"
-  },
-  {
    "name" : "Curl_urldecode"
   },
   {
@@ -2019,9 +1848,6 @@
    "name" : "Curl_cfree"
   },
   {
-   "name" : "Curl_cft_h1_proxy"
-  },
-  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4429,10 +4255,6 @@
      "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
new file mode 100644
index 00000000..18926e4b
--- /dev/null
+++ b/34/64/x86/source-based/libdiskconfig.so.lsdump
@@ -0,0 +1,641 @@
+{
+ "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 a6be39ad..05ed37bf 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" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1551,7 +1551,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "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 01f6102f..f5754d79 100644
--- a/34/64/x86/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/x86/source-based/libdumpstateutil.so.lsdump
@@ -152,9 +152,6 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -204,9 +201,6 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -579,12 +573,6 @@
    "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
   },
   {
-   "function_name" : "android::os::dumpstate::PropertiesHelper::IsStrictRun",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv",
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
    "function_name" : "android::os::dumpstate::PropertiesHelper::IsUserBuild",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv",
    "return_type" : "_ZTIb",
@@ -723,13 +711,6 @@
   },
   {
    "access" : "private",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E",
-   "name" : "android::os::dumpstate::PropertiesHelper::strict_run_",
-   "referenced_type" : "_ZTIi",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
-   "access" : "private",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E",
    "name" : "android::os::dumpstate::PropertiesHelper::parallel_run_",
    "referenced_type" : "_ZTIi",
diff --git a/34/64/x86/source-based/libgralloctypes.so.lsdump b/34/64/x86/source-based/libgralloctypes.so.lsdump
index c5494745..123e644e 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3467,11 +3467,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4052,11 +4052,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/libhardware.so.lsdump b/34/64/x86/source-based/libhardware.so.lsdump
index d9bf0a87..a385fd5a 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -935,7 +935,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -992,7 +992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1069,7 +1069,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1078,7 +1078,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1087,7 +1087,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1118,7 +1118,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1128,7 +1128,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1167,7 +1167,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1223,7 +1223,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1414,7 +1414,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86/source-based/libhidlbase.so.lsdump b/34/64/x86/source-based/libhidlbase.so.lsdump
index 96fcc88f..ec47366a 100644
--- a/34/64/x86/source-based/libhidlbase.so.lsdump
+++ b/34/64/x86/source-based/libhidlbase.so.lsdump
@@ -263,6 +263,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -275,6 +283,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -287,6 +299,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -295,11 +311,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
@@ -1873,6 +1889,22 @@
    "name" : "_ZN7android8hardware21writeEmbeddedToParcelERKNS0_11hidl_stringEPNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware22configureRpcThreadpoolEjb"
   },
   {
@@ -1888,6 +1920,22 @@
    "name" : "_ZN7android8hardware22readEmbeddedFromParcelERKNS0_11hidl_stringERKNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE"
   },
   {
@@ -2349,6 +2397,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
   },
   {
@@ -2752,6 +2820,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE18__lookup_classnameIPKcEEtT_S5_bc"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__112regex_traitsIcE19__transform_primaryINS_11__wrap_iterIPcEEEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SC_c"
   },
   {
@@ -2768,6 +2840,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2828,6 +2904,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEERKT_"
   },
   {
@@ -2836,6 +2916,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2844,15 +2928,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
   },
   {
    "binding" : "weak",
@@ -2868,10 +2956,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__parse_BACKREFIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__push_back_refEi"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ORD_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ecma_expIPKcEET_S7_S7_"
   },
   {
@@ -2888,6 +2984,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_simple_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_ERE_branchIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_awk_escapeIPKcEET_S7_S7_PNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -2924,6 +3028,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2968,10 +3076,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE25__parse_pattern_characterIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE26__parse_bracket_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2988,6 +3092,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__parse_one_char_or_coll_elem_EREIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__push_begin_marked_subexpressionEv"
   },
   {
@@ -2996,10 +3104,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE3endEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE5clearEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEE3endEv"
   },
   {
@@ -3008,6 +3128,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112regex_traitsIcE6__initEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -3016,14 +3144,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS_6vectorIPKcNS_9allocatorISA_EEEEEENSB_ISE_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3036,6 +3180,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3044,6 +3192,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE11__read_modeEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE12__write_modeEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE4openEPKcj"
   },
   {
@@ -3096,7 +3252,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
+   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
   },
   {
    "binding" : "weak",
@@ -3104,10 +3260,46 @@
   },
   {
    "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_"
   },
   {
@@ -3128,6 +3320,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3136,6 +3332,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3144,11 +3344,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
@@ -3156,6 +3356,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -3220,10 +3424,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS1_8hardware9SchedPrioENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_S9_EEEEEixERSE_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEEbNS_4lessIS7_EENS_9allocatorINS_4pairIKS7_bEEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS4_IiEEEENS8_IS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSE_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_4hidl4base4V1_05IBaseEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SH_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_8hardware7IBinderEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SF_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapIPKN7android4hidl4base4V1_05IBaseENS1_2wpINS1_8hardware9BHwBinderEEENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_SB_EEEEEixERSG_"
   },
   {
@@ -3260,26 +3480,70 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISN_EERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_10unique_ptrINS_11__tree_nodeISB_PvEENS_22__tree_node_destructorINSG_ISV_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE4findIS8_EENS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE5eraseENS_21__tree_const_iteratorISB_PNS_11__tree_nodeISB_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS9_PvEENS_22__tree_node_destructorINSE_IST_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE5eraseENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSP_SP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE25__emplace_unique_key_argsIS7_JS7_SD_EEENS_4pairINS_15__tree_iteratorISE_PNS_11__tree_nodeISE_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3296,6 +3560,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3308,7 +3576,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
@@ -3324,6 +3596,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISE_EEEERSR_SR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -3344,15 +3624,19 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE5eraseENS_21__tree_const_iteratorISD_PNS_11__tree_nodeISD_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
@@ -3368,6 +3652,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3380,6 +3672,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS0_IPKcNS_9allocatorIS9_EEEEEENSA_ISD_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -3388,6 +3684,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIccEENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
   },
   {
@@ -3412,10 +3720,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE6resizeEj"
   },
   {
@@ -3456,10 +3772,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE21__push_back_slow_pathIS1_EEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE21__push_back_slow_pathIRKcEEvOT_"
   },
   {
@@ -3468,6 +3796,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2INS_21__tree_const_iteratorIiPNS_11__tree_nodeIiPvEEiEEEET_NS_9enable_ifIXaasr21__is_forward_iteratorISB_EE5valuesr16is_constructibleIiNS_15iterator_traitsISB_E9referenceEEE5valueESB_E4typeE"
   },
   {
@@ -3476,6 +3812,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3764,6 +4104,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -3795,6 +4139,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -3880,6 +4228,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4027,6 +4379,10 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
+  },
+  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4036,6 +4392,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4045,6 +4405,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4071,6 +4435,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8455,6 +8823,42 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::base::V1_0::IBase>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl4base4V1_05IBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl4base4V1_05IBaseEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_215IServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_",
    "parameters" :
@@ -8503,6 +8907,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_",
    "parameters" :
@@ -8552,6 +8972,22 @@
   },
   {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE",
    "parameters" :
    [
@@ -8584,35 +9020,35 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "function_name" : "android::sp<android::hardware::hidl_binder_death_recipient>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     },
     {
-     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
     },
     {
-     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -16946,6 +17382,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::configureRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware22configureRpcThreadpoolEjb",
    "parameters" :
@@ -17036,6 +17584,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::getOrCreateCachedBinder",
    "linker_set_key" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE",
    "parameters" :
@@ -19050,6 +19710,91 @@
   },
   {
    "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
    "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
    "parameters" :
    [
@@ -21419,8 +22164,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/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",
+   "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",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -22770,7 +23515,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/e560d7b19ebf7276b3e850d3d346dec8/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/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 d8e18241..88257567 100644
--- a/34/64/x86/source-based/libmedia_helper.so.lsdump
+++ b/34/64/x86/source-based/libmedia_helper.so.lsdump
@@ -667,33 +667,21 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10valueHacOnE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
-   "name" : "_ZN7android14AudioParameter11valueHacOffE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
-   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -715,15 +703,6 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -733,9 +712,6 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
-   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1449,24 +1425,12 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10keyTtyModeE",
-   "name" : "android::AudioParameter::keyTtyMode",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter10valueFalseE",
    "name" : "android::AudioParameter::valueFalse",
    "referenced_type" : "_ZTIKPKc",
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10valueHacOnE",
-   "name" : "android::AudioParameter::valueHacOn",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter11keyChannelsE",
    "name" : "android::AudioParameter::keyChannels",
    "referenced_type" : "_ZTIKPKc",
@@ -1479,12 +1443,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter11valueHacOffE",
-   "name" : "android::AudioParameter::valueHacOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter12keyProgramIdE",
    "name" : "android::AudioParameter::keyProgramId",
    "referenced_type" : "_ZTIKPKc",
@@ -1497,12 +1455,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter13keyHacSettingE",
-   "name" : "android::AudioParameter::keyHacSetting",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter13keyMonoOutputE",
    "name" : "android::AudioParameter::keyMonoOutput",
    "referenced_type" : "_ZTIKPKc",
@@ -1545,24 +1497,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeHcoE",
-   "name" : "android::AudioParameter::valueTtyModeHco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeOffE",
-   "name" : "android::AudioParameter::valueTtyModeOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeVcoE",
-   "name" : "android::AudioParameter::valueTtyModeVco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter16keyBtLeSuspendedE",
    "name" : "android::AudioParameter::keyBtLeSuspended",
    "referenced_type" : "_ZTIKPKc",
@@ -1581,12 +1515,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter16valueTtyModeFullE",
-   "name" : "android::AudioParameter::valueTtyModeFull",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter17keyPresentationIdE",
    "name" : "android::AudioParameter::keyPresentationId",
    "referenced_type" : "_ZTIKPKc",
diff --git a/34/64/x86/source-based/libmedia_omx.so.lsdump b/34/64/x86/source-based/libmedia_omx.so.lsdump
index 5ef97bed..c78e932b 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5548,7 +5548,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10605,11 +10605,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11196,11 +11196,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11781,11 +11781,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12744,7 +12744,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12762,7 +12762,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12795,7 +12795,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12810,7 +12810,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12828,7 +12828,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12846,7 +12846,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12873,7 +12873,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17046,7 +17046,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17073,7 +17073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17100,7 +17100,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17118,7 +17118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17235,7 +17235,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17244,7 +17244,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17253,7 +17253,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17262,7 +17262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17271,7 +17271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17280,7 +17280,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17289,7 +17289,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18886,15 +18886,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "_ZTIN7android12LightRefBaseINS_5FenceEEE",
-   "self_type" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android12NativeHandleE",
    "name" : "android::NativeHandle *",
    "referenced_type" : "_ZTIN7android12NativeHandleE",
@@ -19003,15 +18994,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "_ZTIN7android19FenceToFenceTimeMapE",
-   "self_type" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -20358,7 +20340,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20385,7 +20367,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20565,7 +20547,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20595,7 +20577,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22370,13 +22352,11 @@
    "source_file" : "frameworks/av/media/libmedia/include/media/MediaCodecBuffer.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
    "name" : "const std::shared_ptr<android::FenceTime>",
    "referenced_type" : "_ZTINSt3__110shared_ptrIN7android9FenceTimeEEE",
    "self_type" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
-   "size" : 8,
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -23184,7 +23164,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23240,7 +23220,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23425,7 +23405,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23569,7 +23549,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23862,7 +23842,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24244,7 +24224,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35363,12 +35343,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43473,15 +43447,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ALooperEEE",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ALooperEEE",
diff --git a/34/64/x86/source-based/libprocessgroup.so.lsdump b/34/64/x86/source-based/libprocessgroup.so.lsdump
index a63c9c64..a375167c 100644
--- a/34/64/x86/source-based/libprocessgroup.so.lsdump
+++ b/34/64/x86/source-based/libprocessgroup.so.lsdump
@@ -145,9 +145,6 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
-   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
-  },
-  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -249,7 +246,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1137,15 +1134,9 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1161,15 +1152,9 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1182,18 +1167,12 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1221,42 +1200,21 @@
    "name" : "_ZNK16ProfileAttribute14GetPathForTaskEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZNK16ProfileAttribute17GetPathForProcessEjiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
-   "name" : "_ZNK16ProfileAttribute9file_nameEv"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction13ExecuteForUIDEj"
   },
   {
    "name" : "_ZNK18SetAttributeAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18SetAttributeAction14IsValidForTaskEi"
-  },
-  {
-   "name" : "_ZNK18SetAttributeAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18SetAttributeAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK19SetTimerSlackAction14ExecuteForTaskEi"
   },
   {
diff --git a/34/64/x86/source-based/libsqlite.so.lsdump b/34/64/x86/source-based/libsqlite.so.lsdump
index 4282a1df..4e718747 100644
--- a/34/64/x86/source-based/libsqlite.so.lsdump
+++ b/34/64/x86/source-based/libsqlite.so.lsdump
@@ -337,9 +337,6 @@
    "name" : "sqlite3_interrupt"
   },
   {
-   "name" : "sqlite3_is_interrupted"
-  },
-  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -694,9 +691,6 @@
    "name" : "sqlite3_value_dup"
   },
   {
-   "name" : "sqlite3_value_encoding"
-  },
-  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/x86/source-based/libssl.so.lsdump b/34/64/x86/source-based/libssl.so.lsdump
index 4b220fb2..b1977369 100644
--- a/34/64/x86/source-based/libssl.so.lsdump
+++ b/34/64/x86/source-based/libssl.so.lsdump
@@ -20,15 +20,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA13_22SignatureAlgorithmName",
-   "name" : "SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1424_h",
    "name" : "unsigned char[1424]",
@@ -74,15 +65,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA24_13ssl_cipher_st",
-   "name" : "ssl_cipher_st[24]",
-   "referenced_type" : "_ZTI13ssl_cipher_st",
-   "self_type" : "_ZTIA24_13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA24_h",
    "name" : "unsigned char[24]",
@@ -137,15 +119,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA3_PKc",
-   "name" : "const char *[3]",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIA3_PKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "linker_set_key" : "_ZTIA3_t",
    "name" : "unsigned short[3]",
@@ -192,11 +165,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -227,24 +200,6 @@
    "source_file" : "external/boringssl/src/include/openssl/sha.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl10NamedGroupE",
-   "name" : "bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIN4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl11VersionInfoE",
-   "name" : "bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA7776_h",
    "name" : "unsigned char[7776]",
@@ -555,9 +510,6 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
-   "name" : "SSL_CIPHER_get_handshake_digest"
-  },
-  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -582,6 +534,9 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
+   "name" : "SSL_CIPHER_get_value"
+  },
+  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -846,9 +801,6 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
-   "name" : "SSL_CTX_set1_group_ids"
-  },
-  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1410,24 +1362,6 @@
    "name" : "SSL_get_SSL_CTX"
   },
   {
-   "name" : "SSL_get_all_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_curve_names"
-  },
-  {
-   "name" : "SSL_get_all_group_names"
-  },
-  {
-   "name" : "SSL_get_all_signature_algorithm_names"
-  },
-  {
-   "name" : "SSL_get_all_standard_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_version_names"
-  },
-  {
    "name" : "SSL_get_certificate"
   },
   {
@@ -1488,12 +1422,6 @@
    "name" : "SSL_get_finished"
   },
   {
-   "name" : "SSL_get_group_id"
-  },
-  {
-   "name" : "SSL_get_group_name"
-  },
-  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1515,9 +1443,6 @@
    "name" : "SSL_get_mode"
   },
   {
-   "name" : "SSL_get_negotiated_group"
-  },
-  {
    "name" : "SSL_get_options"
   },
   {
@@ -1788,9 +1713,6 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
-   "name" : "SSL_set1_group_ids"
-  },
-  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2169,9 +2091,6 @@
    "name" : "_ZN4bssl24ssl_cert_check_key_usageEPK6cbs_stNS_15ssl_key_usage_tE"
   },
   {
-   "name" : "_ZN4bssl24ssl_cipher_is_deprecatedEPK13ssl_cipher_st"
-  },
-  {
    "name" : "_ZN4bssl28ssl_is_valid_ech_public_nameENS_4SpanIKhEE"
   },
   {
@@ -6779,18 +6698,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CIPHER_get_handshake_digest",
-   "linker_set_key" : "SSL_CIPHER_get_handshake_digest",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK13ssl_cipher_st"
-    }
-   ],
-   "return_type" : "_ZTIPK9env_md_st",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CIPHER_get_id",
    "linker_set_key" : "SSL_CIPHER_get_id",
    "parameters" :
@@ -6887,6 +6794,18 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CIPHER_get_value",
+   "linker_set_key" : "SSL_CIPHER_get_value",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK13ssl_cipher_st"
+    }
+   ],
+   "return_type" : "_ZTIt",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CIPHER_get_version",
    "linker_set_key" : "SSL_CIPHER_get_version",
    "parameters" :
@@ -8045,24 +7964,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CTX_set1_group_ids",
-   "linker_set_key" : "SSL_CTX_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP10ssl_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CTX_set1_groups",
    "linker_set_key" : "SSL_CTX_set1_groups",
    "parameters" :
@@ -10898,96 +10799,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_all_cipher_names",
-   "linker_set_key" : "SSL_get_all_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_curve_names",
-   "linker_set_key" : "SSL_get_all_curve_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_group_names",
-   "linker_set_key" : "SSL_get_all_group_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_signature_algorithm_names",
-   "linker_set_key" : "SSL_get_all_signature_algorithm_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_standard_cipher_names",
-   "linker_set_key" : "SSL_get_all_standard_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_version_names",
-   "linker_set_key" : "SSL_get_all_version_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_certificate",
    "linker_set_key" : "SSL_get_certificate",
    "parameters" :
@@ -11255,30 +11066,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_group_id",
-   "linker_set_key" : "SSL_get_group_id",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIt",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_group_name",
-   "linker_set_key" : "SSL_get_group_name",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIt"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_info_callback",
    "linker_set_key" : "SSL_get_info_callback",
    "parameters" :
@@ -11372,18 +11159,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_negotiated_group",
-   "linker_set_key" : "SSL_get_negotiated_group",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_options",
    "linker_set_key" : "SSL_get_options",
    "parameters" :
@@ -12641,24 +12416,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_set1_group_ids",
-   "linker_set_key" : "SSL_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP6ssl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_set1_groups",
    "linker_set_key" : "SSL_set1_groups",
    "parameters" :
@@ -14485,15 +14242,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName (&)[13]",
-   "referenced_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "self_type" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA16_Kh",
    "name" : "const unsigned char (&)[16]",
    "referenced_type" : "_ZTIA16_Kh",
@@ -14521,15 +14269,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st (&)[24]",
-   "referenced_type" : "_ZTIA24_K13ssl_cipher_st",
-   "self_type" : "_ZTIRA24_K13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA2_Kh",
    "name" : "const unsigned char (&)[2]",
    "referenced_type" : "_ZTIA2_Kh",
@@ -14575,15 +14314,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_KPKc",
-   "name" : "const char *const (&)[3]",
-   "referenced_type" : "_ZTIA3_KPKc",
-   "self_type" : "_ZTIRA3_KPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA3_Kt",
    "name" : "const unsigned short (&)[3]",
    "referenced_type" : "_ZTIA3_Kt",
@@ -14593,15 +14323,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_PKc",
-   "name" : "const char *(&)[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIRA3_PKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA4_Kh",
    "name" : "const unsigned char (&)[4]",
    "referenced_type" : "_ZTIA4_Kh",
@@ -14620,24 +14341,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA8_Kh",
    "name" : "const unsigned char (&)[8]",
    "referenced_type" : "_ZTIA8_Kh",
@@ -14665,24 +14368,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK13ssl_cipher_st",
-   "name" : "const ssl_cipher_st &",
-   "referenced_type" : "_ZTIK13ssl_cipher_st",
-   "self_type" : "_ZTIRK13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName &",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIRK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRK6cbs_st",
    "name" : "const cbs_st &",
    "referenced_type" : "_ZTIK6cbs_st",
@@ -14692,33 +14377,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup &",
-   "referenced_type" : "_ZTIKN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRKN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo &",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> &",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> &",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -14872,15 +14530,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKPKc",
-   "name" : "const char *const &",
-   "referenced_type" : "_ZTIKPKc",
-   "self_type" : "_ZTIRKPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKh",
    "name" : "const unsigned char &",
    "referenced_type" : "_ZTIKh",
@@ -14971,15 +14620,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRPKc",
-   "name" : "const char *&",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIRPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRh",
    "name" : "unsigned char &",
    "referenced_type" : "_ZTIh",
@@ -15100,6 +14740,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP11rsa_meth_st",
+   "name" : "rsa_meth_st *",
+   "referenced_type" : "_ZTI11rsa_meth_st",
+   "self_type" : "_ZTIP11rsa_meth_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ssl_comp_st",
    "name" : "ssl_comp_st *",
    "referenced_type" : "_ZTI11ssl_comp_st",
@@ -15343,6 +14992,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
    "name" : "bn_mont_ctx_st *",
    "referenced_type" : "_ZTI14bn_mont_ctx_st",
@@ -18565,15 +18223,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName *",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIPK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK22ssl_early_callback_ctx",
    "name" : "const ssl_early_callback_ctx *",
    "referenced_type" : "_ZTIK22ssl_early_callback_ctx",
@@ -18817,15 +18466,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo *",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIPKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIK13ssl_cipher_stEE",
    "name" : "const bssl::Span<const ssl_cipher_st> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIK13ssl_cipher_stEE",
@@ -18835,15 +18475,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -18853,24 +18484,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKbEE",
@@ -18916,15 +18529,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -19501,15 +19105,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -19519,24 +19114,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKbEE",
    "name" : "bssl::Span<const bool> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -19582,15 +19159,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIhEE",
    "name" : "bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -19753,6 +19321,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14ssl_session_st",
    "name" : "ssl_session_st **",
    "referenced_type" : "_ZTIP14ssl_session_st",
@@ -19785,7 +19362,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19821,7 +19398,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -19891,16 +19468,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA16_Kh",
@@ -19931,16 +19498,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st[24]",
-   "referenced_type" : "_ZTIA24_13ssl_cipher_st",
-   "self_type" : "_ZTIA24_K13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA2_Kh",
@@ -19981,16 +19538,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA3_KPKc",
-   "name" : "const char *const[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIA3_KPKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "_ZTIA3_Kt",
@@ -20021,26 +19568,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA8_Kh",
@@ -20341,7 +19868,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20667,16 +20194,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIK22SignatureAlgorithmName",
-   "size" : 26,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK22ssl_early_callback_ctx",
@@ -20849,11 +20366,13 @@
    "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"
   },
   {
@@ -20905,17 +20424,7 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 72,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIKN4bssl11VersionInfoE",
-   "size" : 8,
+   "size" : 32,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20931,16 +20440,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName>",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup>",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -20951,26 +20450,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool>",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -21021,16 +20500,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *>",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char>",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -21075,7 +20544,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" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22864,7 +22333,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4544,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22872,7 +22341,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22900,22 +22369,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4672,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5376,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5440,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22923,7 +22392,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23689,7 +23158,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -23701,7 +23170,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 564,
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -24028,6 +23497,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 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"
     },
@@ -24436,41 +24148,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPK22SignatureAlgorithmName"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE"
     }
    ],
@@ -24506,76 +24183,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKN4bssl11VersionInfoE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKbEE"
     }
    ],
@@ -24751,41 +24358,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKhEE"
     }
    ],
@@ -26471,7 +26043,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" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26494,7 +26066,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" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26759,20 +26331,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::internal::SpanBase<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE",
    "name" : "bssl::internal::SpanBase<const bssl::NamedGroup>",
    "record_kind" : "class",
@@ -26787,34 +26345,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "name" : "bssl::internal::SpanBase<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "name" : "bssl::internal::SpanBase<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKbEE",
    "name" : "bssl::internal::SpanBase<const bool>",
    "record_kind" : "class",
diff --git a/34/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 5384ba92..0547276f 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" : 28,
+   "size" : 24,
    "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" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6733,19 +6733,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6836,19 +6830,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9111,7 +9099,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9130,7 +9118,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 3435ed8f..b57d79e6 100644
--- a/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -981,9 +981,6 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
-   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -11703,11 +11700,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12294,11 +12291,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12879,11 +12876,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14476,37 +14473,6 @@
   },
   {
    "function_name" : "android::GraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android19GraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_16ComponentWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::GraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy",
    "parameters" :
    [
diff --git a/34/64/x86/source-based/libstagefright_foundation.so.lsdump b/34/64/x86/source-based/libstagefright_foundation.so.lsdump
index fac3d3cd..3b4fc1fb 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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_static/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_static/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 3e7f5265..64ac504f 100644
--- a/34/64/x86/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/x86/source-based/libstagefright_omx.so.lsdump
@@ -642,9 +642,6 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
-   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -15371,37 +15368,6 @@
   },
   {
    "function_name" : "android::OmxGraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android22OmxGraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_15IOmxNodeWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::OmxGraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy",
    "parameters" :
    [
@@ -43281,15 +43247,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ABufferEEE",
    "name" : "android::sp<android::ABuffer> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ABufferEEE",
diff --git a/34/64/x86/source-based/libstagefright_omx_utils.so.lsdump b/34/64/x86/source-based/libstagefright_omx_utils.so.lsdump
index 924b2206..ecf2ee5b 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24585,12 +24585,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/x86/source-based/libtinyalsa.so.lsdump b/34/64/x86/source-based/libtinyalsa.so.lsdump
index 4aa00794..6822d0d1 100644
--- a/34/64/x86/source-based/libtinyalsa.so.lsdump
+++ b/34/64/x86/source-based/libtinyalsa.so.lsdump
@@ -218,9 +218,6 @@
    "name" : "pcm_get_subdevice"
   },
   {
-   "name" : "pcm_get_xruns"
-  },
-  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1301,18 +1298,6 @@
    "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
   },
   {
-   "function_name" : "pcm_get_xruns",
-   "linker_set_key" : "pcm_get_xruns",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP3pcm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
-  },
-  {
    "function_name" : "pcm_ioctl",
    "linker_set_key" : "pcm_ioctl",
    "parameters" :
diff --git a/34/64/x86/source-based/libui.so.lsdump b/34/64/x86/source-based/libui.so.lsdump
index f08d4552..882bcdfe 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -859,6 +859,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -867,10 +871,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1201,10 +1213,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1445,6 +1453,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1453,9 +1465,21 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS9_8hidl_vecIhEEPT_ESS_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS8_20StandardMetadataTypeEPFiRKNSD_8hidl_vecIhEEPT_ESR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIjEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIyEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper18validateBufferSizeEPK13native_handlejjijyj"
   },
   {
@@ -1483,6 +1507,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1499,6 +1527,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1518,6 +1550,10 @@
    "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalIN4aidl7android8hardware8graphics6common9Smpte2086EEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSO_PNSE_8hidl_vecIhEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSM_PNSC_8hidl_vecIhEEE"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper4lockEPK13native_handleyRKNS_4RectEiP13android_ycbcr"
   },
   {
@@ -2306,6 +2342,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE14__erase_uniqueIS4_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE25__emplace_unique_key_argsIS4_JRKNS_21piecewise_construct_tENS_5tupleIJOS4_EEENSR_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeISC_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -2334,6 +2374,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2342,15 +2386,31 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113unordered_mapIPN7android5FenceENS_6vectorINS_8weak_ptrINS1_9FenceTimeEEENS_9allocatorIS7_EEEENS_4hashIS3_EENS_8equal_toIS3_EENS8_INS_4pairIKS3_SA_EEEEEixEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -2358,6 +2418,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -2382,6 +2450,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2430,14 +2502,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEEC2Ej"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware6common12NativeHandleENS_9allocatorIS5_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
@@ -2450,10 +2538,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE6assignIPS6_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS6_NS_15iterator_traitsISD_E9referenceEEE5valueEvE4typeESD_SD_"
   },
   {
@@ -2462,11 +2566,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
@@ -2482,6 +2590,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EEPS2_"
   },
   {
@@ -2502,6 +2614,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEEC2Ej"
   },
   {
@@ -2510,6 +2630,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
   },
   {
@@ -2518,6 +2642,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5eraseENS_11__wrap_iterIPKS4_EESB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE6resizeEj"
   },
   {
@@ -2530,10 +2662,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPKhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS8_E9referenceEEE5valueEvE4typeES8_S8_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
   },
   {
@@ -2542,6 +2690,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
@@ -3863,7 +4023,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -3879,11 +4039,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -3892,7 +4052,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4084,7 +4244,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4100,71 +4260,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4484,7 +4644,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4492,7 +4652,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7254,7 +7414,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8236,11 +8396,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8827,11 +8987,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9412,11 +9572,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10728,7 +10888,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10746,7 +10906,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10779,7 +10939,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10794,7 +10954,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10812,7 +10972,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10830,7 +10990,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10857,7 +11017,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10902,7 +11062,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10920,7 +11080,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10941,7 +11101,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10965,7 +11125,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11001,7 +11161,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11040,7 +11200,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11076,7 +11236,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11115,7 +11275,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11148,7 +11308,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11166,7 +11326,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11202,7 +11362,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11223,7 +11383,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14369,6 +14529,19 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/PublicFormat.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::clear",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_5FenceEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::Fence>::~sp",
    "linker_set_key" : "_ZN7android2spINS_5FenceEED2Ev",
    "parameters" :
@@ -14398,6 +14571,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_",
    "parameters" :
@@ -14414,6 +14603,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V4_0::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_",
    "parameters" :
@@ -16096,12 +16301,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
@@ -22019,7 +22218,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22028,7 +22227,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22073,7 +22272,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22109,7 +22308,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22118,7 +22317,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22208,7 +22407,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22217,7 +22416,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22226,7 +22425,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22235,7 +22434,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22244,7 +22443,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22253,7 +22452,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22262,7 +22461,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22280,7 +22479,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22289,7 +22488,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22298,7 +22497,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22307,7 +22506,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22316,7 +22515,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22325,7 +22524,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22334,7 +22533,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22343,7 +22542,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22352,7 +22551,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22361,7 +22560,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22379,7 +22578,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22388,7 +22587,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22415,7 +22614,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22442,7 +22641,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25367,7 +25566,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25498,7 +25697,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25536,7 +25735,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28073,7 +28272,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28129,7 +28328,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28293,7 +28492,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28390,7 +28589,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28549,7 +28748,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28737,7 +28936,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86/source-based/libunwindstack.so.lsdump b/34/64/x86/source-based/libunwindstack.so.lsdump
index 096baf48..3c0d835b 100644
--- a/34/64/x86/source-based/libunwindstack.so.lsdump
+++ b/34/64/x86/source-based/libunwindstack.so.lsdump
@@ -102,6 +102,24 @@
   },
   {
    "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",
@@ -229,367 +247,400 @@
    "name" : "AsmGetRegs"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
+   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
+   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
+   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
+   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
-   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
   },
   {
-   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
+   "name" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips645CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C2Ev"
   },
   {
    "name" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE"
@@ -2480,6 +2531,45 @@
    "name" : "_ZN11unwindstack8MemoryXzD2Ev"
   },
   {
+   "name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips5CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC2Ev"
+  },
+  {
    "name" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy"
   },
   {
@@ -3216,13 +3306,10 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
-  },
-  {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
   },
   {
    "binding" : "weak",
@@ -3291,6 +3378,9 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
+   "name" : "_ZTVN11unwindstack10RegsMips64E"
+  },
+  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3482,6 +3572,9 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
+   "name" : "_ZTVN11unwindstack8RegsMipsE"
+  },
+  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3545,9 +3638,6 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
-  },
-  {
-   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3719,6 +3809,48 @@
    "underlying_type" : "_ZTIy"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS32_EF_R0"
+    },
+    {
+     "enum_field_value" : 40,
+     "name" : "unwindstack::MIPS32_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "name" : "unwindstack::Mips32UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_EF_R0"
+    },
+    {
+     "enum_field_value" : 34,
+     "name" : "unwindstack::MIPS64_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "name" : "unwindstack::Mips64UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4049,6 +4181,163 @@
    "underlying_type" : "_ZTIt"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack7MipsRegE",
+   "name" : "unwindstack::MipsReg",
+   "referenced_type" : "_ZTIN11unwindstack7MipsRegE",
+   "self_type" : "_ZTIN11unwindstack7MipsRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4074,6 +4363,14 @@
     },
     {
      "enum_field_value" : 5,
+     "name" : "unwindstack::ARCH_MIPS"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::ARCH_MIPS64"
+    },
+    {
+     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4341,6 +4638,163 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS64_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS64_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS64_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS64_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS64_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS64_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS64_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS64_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS64_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS64_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS64_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS64_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS64_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS64_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS64_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS64_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS64_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS64_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS64_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS64_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS64_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS64_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS64_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS64_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS64_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS64_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS64_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS64_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS64_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS64_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS64_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack9Mips64RegE",
+   "name" : "unwindstack::Mips64Reg",
+   "referenced_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "self_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "unwindstack::X86_64_REG_RAX"
     },
     {
@@ -4446,6 +4900,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/Maps.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips64::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Arch",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Read",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Clone",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips645CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
    "function_name" : "unwindstack::RegsX86_64::SetFromUcontext",
    "linker_set_key" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE",
    "parameters" :
@@ -7177,6 +7819,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsX86.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Arch",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Read",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Clone",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips5CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "unwindstack::Unwinder::FillInFrame",
    "linker_set_key" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy",
@@ -8109,6 +8939,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64 *",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIPN11unwindstack10RegsMips64E",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64 *",
    "referenced_type" : "_ZTIN11unwindstack10RegsX86_64E",
@@ -8469,6 +9308,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips *",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIPN11unwindstack8RegsMipsE",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack8UnwinderE",
    "name" : "unwindstack::Unwinder *",
    "referenced_type" : "_ZTIN11unwindstack8UnwinderE",
@@ -8985,6 +9833,82 @@
      "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",
@@ -9712,6 +10636,32 @@
    "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"
     },
@@ -10054,6 +11004,48 @@
      "referenced_type" : "_ZTIy"
     },
     {
+     "field_name" : "ss_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "name" : "unwindstack::mips64_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "self_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "size" : 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"
@@ -10447,6 +11439,68 @@
   },
   {
    "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" :
    [
     {
@@ -10849,6 +11903,22 @@
    "fields" :
    [
     {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_y"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "name" : "unwindstack::mips64_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "self_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIy"
     }
@@ -11011,6 +12081,103 @@
    "fields" :
    [
     {
+     "field_name" : "sc_regs",
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_fpregs",
+     "field_offset" : 2048,
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_mdhi",
+     "field_offset" : 4096,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi1",
+     "field_offset" : 4160,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi2",
+     "field_offset" : 4224,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi3",
+     "field_offset" : 4288,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_mdlo",
+     "field_offset" : 4352,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo1",
+     "field_offset" : 4416,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo2",
+     "field_offset" : 4480,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo3",
+     "field_offset" : 4544,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 4608,
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "name" : "unwindstack::mips64_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "size" : 584,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 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"
     }
@@ -12594,6 +13761,82 @@
   },
   {
    "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 808b3aca..9f63b0c1 100644
--- a/34/64/x86/source-based/libutils.so.lsdump
+++ b/34/64/x86/source-based/libutils.so.lsdump
@@ -492,6 +492,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -503,6 +507,10 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
+  },
+  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -737,6 +745,9 @@
    "name" : "_ZN7android7String813appendFormatVEPKcPc"
   },
   {
+   "name" : "_ZN7android7String816convertToResPathEv"
+  },
+  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1215,6 +1226,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1239,6 +1254,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueIyEEjRKT_"
   },
   {
@@ -1251,6 +1270,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE4findIyEENS_15__hash_iteratorIPNS_11__hash_nodeIS5_PvEEEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS5_PvEEEE"
   },
   {
@@ -5740,6 +5763,19 @@
    "source_file" : "system/core/libutils/include/utils/misc.h"
   },
   {
+   "function_name" : "android::sp<android::LooperCallback>::clear",
+   "linker_set_key" : "_ZN7android2spINS_14LooperCallbackEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14LooperCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::SimpleLooperCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_",
    "parameters" :
@@ -5785,6 +5821,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::Thread>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6ThreadEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6ThreadEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6ThreadEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6ThreadEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::LightRefBase_reportIncStrongRequireStrongFailed",
    "linker_set_key" : "_ZN7android47LightRefBase_reportIncStrongRequireStrongFailedEPKv",
    "parameters" :
@@ -7015,6 +7067,19 @@
    "source_file" : "system/core/libutils/include/utils/String8.h"
   },
   {
+   "function_name" : "android::String8::convertToResPath",
+   "linker_set_key" : "_ZN7android7String816convertToResPathEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android7String8E"
+    }
+   ],
+   "return_type" : "_ZTIRN7android7String8E",
+   "source_file" : "system/core/libutils/include/utils/String8.h"
+  },
+  {
    "function_name" : "android::String8::clear",
    "linker_set_key" : "_ZN7android7String85clearEv",
    "parameters" :
diff --git a/34/64/x86/source-based/libxml2.so.lsdump b/34/64/x86/source-based/libxml2.so.lsdump
index c4eaf143..243219ca 100644
--- a/34/64/x86/source-based/libxml2.so.lsdump
+++ b/34/64/x86/source-based/libxml2.so.lsdump
@@ -718,9 +718,6 @@
    "name" : "xmlCtxtResetPush"
   },
   {
-   "name" : "xmlCtxtSetMaxAmplification"
-  },
-  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1405,9 +1402,6 @@
    "name" : "xmlMemShow"
   },
   {
-   "name" : "xmlMemSize"
-  },
-  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1921,9 +1915,6 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
-   "name" : "xmlParserInputBufferCreateString"
-  },
-  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3010,9 +3001,6 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
-   "name" : "xmlTextReaderSetMaxAmplification"
-  },
-  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5401,43 +5389,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "XML_ENC_ERR_SUCCESS"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "XML_ENC_ERR_SPACE"
-    },
-    {
-     "enum_field_value" : -2,
-     "name" : "XML_ENC_ERR_INPUT"
-    },
-    {
-     "enum_field_value" : -3,
-     "name" : "XML_ENC_ERR_PARTIAL"
-    },
-    {
-     "enum_field_value" : -4,
-     "name" : "XML_ENC_ERR_INTERNAL"
-    },
-    {
-     "enum_field_value" : -5,
-     "name" : "XML_ENC_ERR_MEMORY"
-    }
-   ],
-   "linker_set_key" : "_ZTI15xmlCharEncError",
-   "name" : "xmlCharEncError",
-   "referenced_type" : "_ZTI15xmlCharEncError",
-   "self_type" : "_ZTI15xmlCharEncError",
-   "size" : 4,
-   "source_file" : "external/libxml2/include/libxml/encoding.h",
-   "underlying_type" : "_ZTIi"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : -1,
      "name" : "XML_CHAR_ENCODING_ERROR"
     },
@@ -6020,10 +5971,6 @@
      "name" : "XML_ERR_COMMENT_ABRUPTLY_ENDED"
     },
     {
-     "enum_field_value" : 113,
-     "name" : "XML_WAR_ENCODING_MISMATCH"
-    },
-    {
      "enum_field_value" : 200,
      "name" : "XML_NS_ERR_XML_NAMESPACE"
     },
@@ -9543,10 +9490,6 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -14027,21 +13970,6 @@
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
-   "function_name" : "xmlCtxtSetMaxAmplification",
-   "linker_set_key" : "xmlCtxtSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlParserCtxt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/parser.h"
-  },
-  {
    "function_name" : "xmlCtxtUseOptions",
    "linker_set_key" : "xmlCtxtUseOptions",
    "parameters" :
@@ -17291,18 +17219,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
   },
   {
-   "function_name" : "xmlMemSize",
-   "linker_set_key" : "xmlMemSize",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
-  },
-  {
    "function_name" : "xmlMemStrdupLoc",
    "linker_set_key" : "xmlMemStrdupLoc",
    "parameters" :
@@ -19826,18 +19742,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlIO.h"
   },
   {
-   "function_name" : "xmlParserInputBufferCreateString",
-   "linker_set_key" : "xmlParserInputBufferCreateString",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    }
-   ],
-   "return_type" : "_ZTIP21_xmlParserInputBuffer",
-   "source_file" : "external/libxml2/include/private/io.h"
-  },
-  {
    "function_name" : "xmlParserInputBufferGrow",
    "linker_set_key" : "xmlParserInputBufferGrow",
    "parameters" :
@@ -22714,7 +22618,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25502,21 +25406,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlreader.h"
   },
   {
-   "function_name" : "xmlTextReaderSetMaxAmplification",
-   "linker_set_key" : "xmlTextReaderSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlTextReader"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/xmlreader.h"
-  },
-  {
    "function_name" : "xmlTextReaderSetParserProp",
    "linker_set_key" : "xmlTextReaderSetParserProp",
    "parameters" :
@@ -35400,18 +35289,13 @@
      "field_name" : "nbWarnings",
      "field_offset" : 3824,
      "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "maxAmpl",
-     "field_offset" : 3840,
-     "referenced_type" : "_ZTIj"
     }
    ],
    "linker_set_key" : "_ZTI14_xmlParserCtxt",
    "name" : "_xmlParserCtxt",
    "referenced_type" : "_ZTI14_xmlParserCtxt",
    "self_type" : "_ZTI14_xmlParserCtxt",
-   "size" : 484,
+   "size" : 480,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -36095,7 +35979,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "flags",
+     "field_name" : "standalone",
      "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 63d04172..37f583d9 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/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -17,7 +17,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 1,
@@ -26,7 +26,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA32_h",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -175,36 +175,12 @@
    "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"
   },
   {
@@ -220,21 +196,6 @@
    "name" : "ABGRToUVRow_SSSE3"
   },
   {
-   "name" : "ABGRToYJRow_AVX2"
-  },
-  {
-   "name" : "ABGRToYJRow_Any_AVX2"
-  },
-  {
-   "name" : "ABGRToYJRow_Any_SSSE3"
-  },
-  {
-   "name" : "ABGRToYJRow_C"
-  },
-  {
-   "name" : "ABGRToYJRow_SSSE3"
-  },
-  {
    "name" : "ABGRToYRow_AVX2"
   },
   {
@@ -724,9 +685,6 @@
    "name" : "ARGBToI420"
   },
   {
-   "name" : "ARGBToI420Alpha"
-  },
-  {
    "name" : "ARGBToI422"
   },
   {
@@ -1114,24 +1072,6 @@
    "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"
   },
   {
@@ -1153,18 +1093,6 @@
    "name" : "DetileSplitUVRow_SSSE3"
   },
   {
-   "name" : "DetileToYUY2"
-  },
-  {
-   "name" : "DetileToYUY2_Any_SSE2"
-  },
-  {
-   "name" : "DetileToYUY2_C"
-  },
-  {
-   "name" : "DetileToYUY2_SSE2"
-  },
-  {
    "name" : "DivideRow_16_AVX2"
   },
   {
@@ -1204,6 +1132,9 @@
    "name" : "GetARGBBlend"
   },
   {
+   "name" : "GetXCR0"
+  },
+  {
    "name" : "H010ToAB30"
   },
   {
@@ -1321,9 +1252,6 @@
    "name" : "I010Copy"
   },
   {
-   "name" : "I010Rotate"
-  },
-  {
    "name" : "I010ToAB30"
   },
   {
@@ -1381,9 +1309,6 @@
    "name" : "I210Copy"
   },
   {
-   "name" : "I210Rotate"
-  },
-  {
    "name" : "I210ToAB30"
   },
   {
@@ -1483,9 +1408,6 @@
    "name" : "I212ToARGBRow_SSSE3"
   },
   {
-   "name" : "I212ToI420"
-  },
-  {
    "name" : "I212ToI422"
   },
   {
@@ -1534,12 +1456,6 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
-   "name" : "I410Copy"
-  },
-  {
-   "name" : "I410Rotate"
-  },
-  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1579,15 +1495,9 @@
    "name" : "I410ToI010"
   },
   {
-   "name" : "I410ToI420"
-  },
-  {
    "name" : "I410ToI444"
   },
   {
-   "name" : "I412ToI420"
-  },
-  {
    "name" : "I412ToI444"
   },
   {
@@ -1696,9 +1606,6 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
-   "name" : "I420ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1849,18 +1756,6 @@
    "name" : "I422ToNV21"
   },
   {
-   "name" : "I422ToRAW"
-  },
-  {
-   "name" : "I422ToRGB24"
-  },
-  {
-   "name" : "I422ToRGB24Matrix"
-  },
-  {
-   "name" : "I422ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I422ToRGB24Row_AVX2"
   },
   {
@@ -1879,9 +1774,6 @@
    "name" : "I422ToRGB565"
   },
   {
-   "name" : "I422ToRGB565Matrix"
-  },
-  {
    "name" : "I422ToRGB565Row_AVX2"
   },
   {
@@ -2026,30 +1918,6 @@
    "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"
   },
   {
@@ -2146,12 +2014,6 @@
    "name" : "MM21ToNV12"
   },
   {
-   "name" : "MM21ToYUY2"
-  },
-  {
-   "name" : "MT2TToP010"
-  },
-  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -2182,6 +2044,12 @@
    "name" : "MergeARGBPlane"
   },
   {
+   "name" : "MergeARGBPlaneAlpha"
+  },
+  {
+   "name" : "MergeARGBPlaneOpaque"
+  },
+  {
    "name" : "MergeARGBRow_AVX2"
   },
   {
@@ -2227,15 +2095,9 @@
    "name" : "MergeUVRow_AVX2"
   },
   {
-   "name" : "MergeUVRow_AVX512BW"
-  },
-  {
    "name" : "MergeUVRow_Any_AVX2"
   },
   {
-   "name" : "MergeUVRow_Any_AVX512BW"
-  },
-  {
    "name" : "MergeUVRow_Any_SSE2"
   },
   {
@@ -2296,9 +2158,6 @@
    "name" : "MirrorPlane"
   },
   {
-   "name" : "MirrorRow_16_C"
-  },
-  {
    "name" : "MirrorRow_AVX2"
   },
   {
@@ -2524,15 +2383,9 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
-   "name" : "P010ToI010"
-  },
-  {
    "name" : "P010ToP410"
   },
   {
-   "name" : "P012ToI012"
-  },
-  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2818,9 +2671,6 @@
    "name" : "RGBScale"
   },
   {
-   "name" : "RiscvCpuCaps"
-  },
-  {
    "name" : "RotatePlane"
   },
   {
@@ -2833,9 +2683,6 @@
    "name" : "RotatePlane90"
   },
   {
-   "name" : "RotatePlane_16"
-  },
-  {
    "name" : "Scale"
   },
   {
@@ -2977,9 +2824,6 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
-   "name" : "ScalePlaneDown2_16To8"
-  },
-  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -3013,12 +2857,6 @@
    "name" : "ScalePlane_16"
   },
   {
-   "name" : "ScaleRowDown2Box_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Box_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -3046,12 +2884,6 @@
    "name" : "ScaleRowDown2Box_SSSE3"
   },
   {
-   "name" : "ScaleRowDown2Linear_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -3070,12 +2902,6 @@
    "name" : "ScaleRowDown2Linear_SSSE3"
   },
   {
-   "name" : "ScaleRowDown2_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -3505,6 +3331,12 @@
    "name" : "SplitARGBPlane"
   },
   {
+   "name" : "SplitARGBPlaneAlpha"
+  },
+  {
+   "name" : "SplitARGBPlaneOpaque"
+  },
+  {
    "name" : "SplitARGBRow_AVX2"
   },
   {
@@ -3631,33 +3463,15 @@
    "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"
   },
   {
@@ -3667,9 +3481,6 @@
    "name" : "TransposeWx8_SSSE3"
   },
   {
-   "name" : "TransposeWxH_16_C"
-  },
-  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3796,9 +3607,6 @@
    "name" : "UYVYToYRow_SSE2"
   },
   {
-   "name" : "UnpackMT2T_C"
-  },
-  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3832,21 +3640,6 @@
    "name" : "YUY2ToNV12"
   },
   {
-   "name" : "YUY2ToNVUVRow_AVX2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_Any_AVX2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_Any_SSE2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_C"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_SSE2"
-  },
-  {
    "name" : "YUY2ToUV422Row_AVX2"
   },
   {
@@ -4088,7 +3881,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4129,7 +3922,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4162,7 +3955,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4475,7 +4268,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4724,7 +4517,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4752,7 +4545,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4776,7 +4569,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4806,7 +4599,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_AVX2",
@@ -4824,7 +4617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_AVX2",
@@ -4842,7 +4635,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_SSSE3",
@@ -4860,7 +4653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4878,7 +4671,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_SSSE3",
@@ -4896,7 +4689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4923,7 +4716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_AVX2",
@@ -4941,7 +4734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_AVX2",
@@ -4959,7 +4752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_SSSE3",
@@ -4977,7 +4770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4995,7 +4788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_SSSE3",
@@ -5013,7 +4806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -5040,7 +4833,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -5079,112 +4872,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ400",
-   "linker_set_key" : "ABGRToJ400",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ420",
-   "linker_set_key" : "ABGRToJ420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ422",
-   "linker_set_key" : "ABGRToJ422",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -5217,7 +4905,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -5250,127 +4938,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_AVX2",
@@ -5394,7 +4962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_AVX2",
@@ -5418,7 +4986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_SSSE3",
@@ -5442,7 +5010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -5466,7 +5034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_SSSE3",
@@ -5490,97 +5058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_AVX2",
@@ -5598,7 +5076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_AVX2",
@@ -5616,7 +5094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_SSSE3",
@@ -5634,7 +5112,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -5652,7 +5130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_SSSE3",
@@ -5670,7 +5148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -5697,7 +5175,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -5715,7 +5193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -5742,7 +5220,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -5760,7 +5238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -5787,7 +5265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -5805,7 +5283,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -5835,7 +5313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -5856,7 +5334,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -5883,7 +5361,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -5910,7 +5388,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_AVX2",
@@ -5928,7 +5406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_AVX2",
@@ -5946,7 +5424,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_SSSE3",
@@ -5964,7 +5442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -5982,7 +5460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_SSSE3",
@@ -6000,7 +5478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -6027,7 +5505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_SSE2",
@@ -6045,7 +5523,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -6063,7 +5541,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_SSE2",
@@ -6081,7 +5559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -6120,7 +5598,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -6144,7 +5622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -6162,7 +5640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -6189,7 +5667,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_SSE2",
@@ -6207,7 +5685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -6225,7 +5703,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_SSE2",
@@ -6243,7 +5721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -6282,7 +5760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -6306,7 +5784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -6324,7 +5802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -6357,7 +5835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_AVX2",
@@ -6378,7 +5856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_AVX2",
@@ -6399,7 +5877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_SSE2",
@@ -6420,7 +5898,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -6441,7 +5919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_SSE2",
@@ -6462,7 +5940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -6486,7 +5964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_SSE2",
@@ -6510,7 +5988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -6537,7 +6015,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_AVX2",
@@ -6555,7 +6033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_AVX2",
@@ -6573,7 +6051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_SSSE3",
@@ -6591,7 +6069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -6609,7 +6087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_SSSE3",
@@ -6627,7 +6105,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -6660,7 +6138,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -6681,7 +6159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_SSSE3",
@@ -6702,7 +6180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -6738,7 +6216,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -6768,7 +6246,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -6789,7 +6267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_SSSE3",
@@ -6810,7 +6288,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -6840,7 +6318,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -6858,7 +6336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_X86",
@@ -6876,7 +6354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -6903,7 +6381,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -6930,7 +6408,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6957,7 +6435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_AVX2",
@@ -6975,7 +6453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_AVX2",
@@ -6993,7 +6471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_SSE2",
@@ -7011,7 +6489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -7029,7 +6507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_SSE2",
@@ -7047,7 +6525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -7074,7 +6552,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_AVX2",
@@ -7092,7 +6570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_AVX2",
@@ -7110,7 +6588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_SSE2",
@@ -7128,7 +6606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -7146,7 +6624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_SSE2",
@@ -7164,7 +6642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -7185,7 +6663,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -7212,7 +6690,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_AVX2",
@@ -7230,7 +6708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_AVX2",
@@ -7248,7 +6726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_SSE2",
@@ -7266,7 +6744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -7284,7 +6762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_SSE2",
@@ -7302,7 +6780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -7329,7 +6807,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -7347,7 +6825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_SSSE3",
@@ -7365,7 +6843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -7392,7 +6870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -7428,7 +6906,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -7458,7 +6936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -7482,7 +6960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_SSSE3",
@@ -7506,7 +6984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -7533,7 +7011,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_AVX2",
@@ -7551,7 +7029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_AVX2",
@@ -7569,7 +7047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_SSE2",
@@ -7587,7 +7065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -7605,7 +7083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_SSE2",
@@ -7623,7 +7101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -7656,7 +7134,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_AVX2",
@@ -7677,7 +7155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_AVX2",
@@ -7698,7 +7176,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_SSE2",
@@ -7719,7 +7197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -7740,7 +7218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_SSE2",
@@ -7761,7 +7239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -7791,7 +7269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_AVX2",
@@ -7812,7 +7290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -7833,7 +7311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_SSE2",
@@ -7854,7 +7332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -7890,7 +7368,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -7914,7 +7392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_SSE2",
@@ -7938,7 +7416,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -7968,37 +7446,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBRotate",
-   "linker_set_key" : "ARGBRotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -8025,7 +7473,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -8040,7 +7488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_SSSE3",
@@ -8055,7 +7503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -8073,7 +7521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_X86",
@@ -8091,7 +7539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -8121,7 +7569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -8142,7 +7590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_SSE2",
@@ -8163,7 +7611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -8193,7 +7641,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_AVX2",
@@ -8214,7 +7662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_AVX2",
@@ -8235,7 +7683,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_SSSE3",
@@ -8256,7 +7704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -8277,7 +7725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_SSSE3",
@@ -8298,7 +7746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -8325,7 +7773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -8352,7 +7800,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -8379,7 +7827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -8412,7 +7860,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_AVX2",
@@ -8433,7 +7881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_AVX2",
@@ -8454,7 +7902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_SSE2",
@@ -8475,7 +7923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -8496,7 +7944,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_SSE2",
@@ -8517,7 +7965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -8544,7 +7992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_AVX2",
@@ -8562,7 +8010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_AVX2",
@@ -8580,7 +8028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_SSSE3",
@@ -8598,7 +8046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -8616,7 +8064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_SSSE3",
@@ -8634,34 +8082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToABGR",
-   "linker_set_key" : "ARGBToABGR",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -8688,7 +8109,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_AVX2",
@@ -8706,7 +8127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_AVX2",
@@ -8724,7 +8145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_SSSE3",
@@ -8742,7 +8163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -8760,7 +8181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_SSSE3",
@@ -8778,7 +8199,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -8805,7 +8226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_AVX2",
@@ -8823,7 +8244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_AVX2",
@@ -8841,7 +8262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_SSSE3",
@@ -8859,7 +8280,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -8877,7 +8298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_SSSE3",
@@ -8895,7 +8316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -8922,7 +8343,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_SSE2",
@@ -8940,7 +8361,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -8958,7 +8379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_SSE2",
@@ -8976,7 +8397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -9003,7 +8424,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_SSE2",
@@ -9021,7 +8442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -9039,7 +8460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_SSE2",
@@ -9057,34 +8478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToBGRA",
-   "linker_set_key" : "ARGBToBGRA",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -9111,7 +8505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -9150,52 +8544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToI420Alpha",
-   "linker_set_key" : "ARGBToI420Alpha",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -9234,7 +8583,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -9273,7 +8622,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -9300,7 +8649,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -9339,7 +8688,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -9378,7 +8727,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -9411,7 +8760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -9444,7 +8793,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -9471,7 +8820,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_AVX2",
@@ -9489,7 +8838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_AVX2",
@@ -9507,7 +8856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_SSSE3",
@@ -9525,7 +8874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -9543,7 +8892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_SSSE3",
@@ -9561,7 +8910,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -9588,7 +8937,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX2",
@@ -9606,7 +8955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX512VBMI",
@@ -9624,7 +8973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX2",
@@ -9642,7 +8991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX512VBMI",
@@ -9660,7 +9009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_SSSE3",
@@ -9678,7 +9027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -9696,7 +9045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_SSSE3",
@@ -9714,7 +9063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -9741,7 +9090,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -9771,7 +9120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_AVX2",
@@ -9785,14 +9134,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_AVX2",
@@ -9813,7 +9162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_SSE2",
@@ -9834,7 +9183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -9848,14 +9197,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_SSE2",
@@ -9869,14 +9218,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_SSE2",
@@ -9894,7 +9243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -9912,7 +9261,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_SSE2",
@@ -9930,7 +9279,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -9957,7 +9306,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_SSSE3",
@@ -9978,7 +9327,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -9999,7 +9348,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_SSSE3",
@@ -10020,7 +9369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_AVX2",
@@ -10044,7 +9393,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_AVX2",
@@ -10068,7 +9417,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_SSSE3",
@@ -10092,7 +9441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -10116,7 +9465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_SSSE3",
@@ -10140,7 +9489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_AVX2",
@@ -10164,7 +9513,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_AVX2",
@@ -10188,7 +9537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_SSSE3",
@@ -10212,7 +9561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -10236,7 +9585,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_SSSE3",
@@ -10260,7 +9609,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -10287,7 +9636,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_AVX2",
@@ -10305,7 +9654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_AVX2",
@@ -10323,7 +9672,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_SSSE3",
@@ -10341,7 +9690,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -10359,7 +9708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_SSSE3",
@@ -10377,7 +9726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_AVX2",
@@ -10395,7 +9744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_AVX2",
@@ -10413,7 +9762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_SSSE3",
@@ -10431,7 +9780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -10449,7 +9798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_SSSE3",
@@ -10467,7 +9816,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -10494,7 +9843,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -10521,7 +9870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_AVX2",
@@ -10539,7 +9888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_AVX2",
@@ -10557,7 +9906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_SSE2",
@@ -10575,7 +9924,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -10593,7 +9942,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_SSE2",
@@ -10611,7 +9960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -10644,7 +9993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -10677,7 +10026,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -10698,7 +10047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -10719,7 +10068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -10737,7 +10086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -10779,7 +10128,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -10821,7 +10170,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -10866,7 +10215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -10920,7 +10269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -10977,7 +10326,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -10989,7 +10338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -11016,7 +10365,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -11055,7 +10404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_SSSE3",
@@ -11079,7 +10428,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -11103,7 +10452,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_SSSE3",
@@ -11127,7 +10476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_SSSE3",
@@ -11145,7 +10494,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -11163,7 +10512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_SSSE3",
@@ -11181,7 +10530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -11220,7 +10569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_AVX2",
@@ -11244,7 +10593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_AVX2",
@@ -11268,7 +10617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_SSSE3",
@@ -11292,7 +10641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -11316,7 +10665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_SSSE3",
@@ -11340,7 +10689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -11361,7 +10710,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -11382,7 +10731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -11409,7 +10758,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -11436,7 +10785,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -11448,25 +10797,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -11487,7 +10818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_SSE2",
@@ -11508,7 +10839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -11526,7 +10857,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -11544,7 +10875,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -11571,7 +10902,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -11601,7 +10932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_AVX2",
@@ -11622,7 +10953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_AVX2",
@@ -11643,7 +10974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_SSSE3",
@@ -11664,7 +10995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -11685,7 +11016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_SSSE3",
@@ -11706,7 +11037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -11736,7 +11067,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_AVX2",
@@ -11757,7 +11088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_AVX2",
@@ -11778,7 +11109,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_SSE2",
@@ -11799,7 +11130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -11820,7 +11151,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_SSE2",
@@ -11841,7 +11172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -11883,7 +11214,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -11928,7 +11259,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -11985,7 +11316,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -12015,7 +11346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -12045,7 +11376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -12072,7 +11403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -12099,7 +11430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -12117,7 +11448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_AVX",
@@ -12135,7 +11466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_AVX",
@@ -12153,7 +11484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_SSE2",
@@ -12171,7 +11502,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -12189,7 +11520,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_ERMS",
@@ -12207,7 +11538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_SSE2",
@@ -12225,7 +11556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -12243,7 +11574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -12270,7 +11601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_SSE2",
@@ -12297,7 +11628,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -12326,143 +11657,8 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetilePlane_16",
-   "linker_set_key" : "DetilePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_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/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"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_SSE2",
@@ -12483,7 +11679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -12504,7 +11700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_SSE2",
@@ -12525,7 +11721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -12561,7 +11757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_SSSE3",
@@ -12585,7 +11781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -12609,7 +11805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_SSSE3",
@@ -12633,124 +11829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2",
-   "linker_set_key" : "DetileToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_Any_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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_AVX2",
@@ -12771,7 +11850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_AVX2",
@@ -12792,7 +11871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -12813,7 +11892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -12828,7 +11907,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_X86",
@@ -12843,7 +11922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -12858,7 +11937,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_X86",
@@ -12873,37 +11952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::GaussCol_C",
-   "linker_set_key" : "GaussCol_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -12933,7 +11982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -12960,25 +12009,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::GaussRow_C",
-   "linker_set_key" : "GaussRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKj"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -12996,13 +12027,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -13041,7 +12072,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -13080,7 +12111,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -13119,7 +12150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -13158,7 +12189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -13197,7 +12228,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -13236,7 +12267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -13275,7 +12306,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -13314,7 +12345,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -13353,7 +12384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -13392,7 +12423,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -13431,7 +12462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -13470,7 +12501,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -13509,7 +12540,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -13548,7 +12579,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -13587,7 +12618,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -13626,7 +12657,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -13665,7 +12696,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -13704,7 +12735,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -13743,7 +12774,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -13773,7 +12804,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_AVX2",
@@ -13794,7 +12825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_AVX2",
@@ -13815,7 +12846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_SSE2",
@@ -13836,7 +12867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -13857,7 +12888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_SSE2",
@@ -13878,7 +12909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -13911,7 +12942,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_AVX2",
@@ -13938,7 +12969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -13965,7 +12996,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_SSSE3",
@@ -13992,7 +13023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_AVX2",
@@ -14010,7 +13041,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -14028,7 +13059,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSE42",
@@ -14046,7 +13077,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSSE3",
@@ -14064,7 +13095,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -14082,7 +13113,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -14100,7 +13131,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_SSE41",
@@ -14118,7 +13149,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -14169,7 +13200,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -14223,7 +13254,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -14274,61 +13305,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I010Rotate",
-   "linker_set_key" : "I010Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -14367,7 +13344,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -14406,7 +13383,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -14445,7 +13422,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -14487,7 +13464,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -14532,7 +13509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -14571,7 +13548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -14613,7 +13590,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -14658,7 +13635,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -14709,7 +13686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -14760,7 +13737,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -14805,7 +13782,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -14847,7 +13824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -14889,7 +13866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -14940,7 +13917,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -14985,7 +13962,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -15036,7 +14013,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -15090,7 +14067,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -15120,7 +14097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -15171,61 +14148,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I210Rotate",
-   "linker_set_key" : "I210Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -15264,7 +14187,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -15303,7 +14226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -15342,7 +14265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -15384,7 +14307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -15429,7 +14352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_AVX2",
@@ -15456,7 +14379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_AVX2",
@@ -15483,7 +14406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_SSSE3",
@@ -15510,7 +14433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -15537,7 +14460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_SSSE3",
@@ -15564,7 +14487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -15603,7 +14526,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -15645,7 +14568,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -15690,7 +14613,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_AVX2",
@@ -15717,7 +14640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_AVX2",
@@ -15744,7 +14667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_SSSE3",
@@ -15771,7 +14694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -15798,7 +14721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_SSSE3",
@@ -15825,7 +14748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -15876,7 +14799,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -15927,7 +14850,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -15978,7 +14901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -16029,7 +14952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -16074,7 +14997,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_AVX2",
@@ -16101,7 +15024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_AVX2",
@@ -16128,7 +15051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_SSSE3",
@@ -16155,7 +15078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -16182,7 +15105,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_SSSE3",
@@ -16209,7 +15132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_AVX2",
@@ -16236,7 +15159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_AVX2",
@@ -16263,7 +15186,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_SSSE3",
@@ -16290,7 +15213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -16317,7 +15240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_SSSE3",
@@ -16344,58 +15267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I212ToI420",
-   "linker_set_key" : "I212ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -16446,7 +15318,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -16491,7 +15363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -16518,7 +15390,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -16545,7 +15417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -16572,7 +15444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -16602,7 +15474,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_AVX2",
@@ -16623,7 +15495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_AVX2",
@@ -16644,7 +15516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_SSE2",
@@ -16665,7 +15537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -16686,7 +15558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_SSE2",
@@ -16707,7 +15579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -16734,7 +15606,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -16773,7 +15645,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -16806,7 +15678,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -16857,7 +15729,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -16887,112 +15759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I410Copy",
-   "linker_set_key" : "I410Copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I410Rotate",
-   "linker_set_key" : "I410Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -17034,7 +15801,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_AVX2",
@@ -17061,7 +15828,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_AVX2",
@@ -17088,7 +15855,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_SSSE3",
@@ -17115,7 +15882,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -17142,7 +15909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_SSSE3",
@@ -17169,7 +15936,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -17211,7 +15978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_AVX2",
@@ -17238,7 +16005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_AVX2",
@@ -17265,7 +16032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_SSSE3",
@@ -17292,7 +16059,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -17319,7 +16086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_SSSE3",
@@ -17346,7 +16113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -17397,58 +16164,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I410ToI420",
-   "linker_set_key" : "I410ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -17499,58 +16215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I412ToI420",
-   "linker_set_key" : "I412ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -17601,7 +16266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -17649,7 +16314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -17697,7 +16362,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -17748,7 +16413,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -17802,7 +16467,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -17877,7 +16542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -17928,7 +16593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -18000,7 +16665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -18051,7 +16716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -18102,7 +16767,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -18150,7 +16815,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -18204,7 +16869,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -18264,7 +16929,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -18324,7 +16989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -18384,7 +17049,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -18435,7 +17100,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -18474,7 +17139,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -18513,7 +17178,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -18552,7 +17217,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -18594,7 +17259,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -18633,7 +17298,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -18672,7 +17337,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -18711,7 +17376,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -18753,7 +17418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -18798,7 +17463,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -18837,7 +17502,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -18888,7 +17553,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -18939,7 +17604,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -18978,7 +17643,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -19029,7 +17694,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -19080,7 +17745,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -19125,7 +17790,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -19170,7 +17835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -19209,7 +17874,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -19248,7 +17913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -19290,52 +17955,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I420ToRGB24MatrixFilter",
-   "linker_set_key" : "I420ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -19374,7 +17994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -19416,7 +18036,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -19458,7 +18078,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -19497,7 +18117,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -19539,7 +18159,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -19578,7 +18198,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -19617,7 +18237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -19665,7 +18285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -19713,7 +18333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -19764,7 +18384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -19818,7 +18438,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_AVX2",
@@ -19848,7 +18468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_AVX2",
@@ -19878,7 +18498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_SSSE3",
@@ -19908,7 +18528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -19938,7 +18558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_SSSE3",
@@ -19968,7 +18588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -20019,7 +18639,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -20073,7 +18693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -20133,7 +18753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -20193,7 +18813,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -20253,7 +18873,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -20292,7 +18912,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_AVX2",
@@ -20319,7 +18939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_AVX2",
@@ -20346,7 +18966,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_SSSE3",
@@ -20373,7 +18993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -20400,7 +19020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_SSSE3",
@@ -20427,7 +19047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -20466,7 +19086,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_AVX2",
@@ -20493,7 +19113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_AVX2",
@@ -20520,7 +19140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_SSSE3",
@@ -20547,7 +19167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -20574,7 +19194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_SSSE3",
@@ -20601,7 +19221,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_AVX2",
@@ -20628,7 +19248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_AVX2",
@@ -20655,7 +19275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_SSSE3",
@@ -20682,7 +19302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -20709,7 +19329,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_SSSE3",
@@ -20736,7 +19356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -20778,7 +19398,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -20823,7 +19443,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX2",
@@ -20850,7 +19470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX2",
@@ -20877,7 +19497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_SSSE3",
@@ -20904,7 +19524,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -20931,7 +19551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_SSSE3",
@@ -20958,7 +19578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -20997,7 +19617,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -21048,7 +19668,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -21099,7 +19719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -21150,7 +19770,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -21195,172 +19815,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRAW",
-   "linker_set_key" : "I422ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24",
-   "linker_set_key" : "I422ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24Matrix",
-   "linker_set_key" : "I422ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24MatrixFilter",
-   "linker_set_key" : "I422ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_AVX2",
@@ -21387,7 +19842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_AVX2",
@@ -21414,7 +19869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_SSSE3",
@@ -21441,7 +19896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -21468,7 +19923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_SSSE3",
@@ -21495,7 +19950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -21534,49 +19989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB565Matrix",
-   "linker_set_key" : "I422ToRGB565Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_AVX2",
@@ -21603,7 +20016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_AVX2",
@@ -21630,7 +20043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_SSSE3",
@@ -21657,7 +20070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -21684,7 +20097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_SSSE3",
@@ -21711,7 +20124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -21750,7 +20163,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -21792,7 +20205,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_AVX2",
@@ -21819,7 +20232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_AVX2",
@@ -21846,7 +20259,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_SSSE3",
@@ -21873,7 +20286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -21900,7 +20313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_SSSE3",
@@ -21927,7 +20340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -21966,7 +20379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_AVX2",
@@ -21990,7 +20403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_AVX2",
@@ -22014,7 +20427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_SSE2",
@@ -22038,7 +20451,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -22062,7 +20475,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_SSE2",
@@ -22086,7 +20499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -22125,7 +20538,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_AVX2",
@@ -22149,7 +20562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_AVX2",
@@ -22173,7 +20586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_SSE2",
@@ -22197,7 +20610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -22221,7 +20634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_SSE2",
@@ -22245,7 +20658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -22293,7 +20706,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -22341,7 +20754,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -22392,7 +20805,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_AVX2",
@@ -22422,7 +20835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_AVX2",
@@ -22452,7 +20865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_SSSE3",
@@ -22482,7 +20895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -22512,7 +20925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_SSSE3",
@@ -22542,7 +20955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -22593,7 +21006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -22647,7 +21060,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -22707,7 +21120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -22767,7 +21180,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -22827,7 +21240,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -22866,7 +21279,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -22905,7 +21318,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -22947,7 +21360,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_AVX2",
@@ -22974,7 +21387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_AVX2",
@@ -23001,7 +21414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_SSSE3",
@@ -23028,7 +21441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -23055,7 +21468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_SSSE3",
@@ -23082,7 +21495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -23133,7 +21546,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -23178,7 +21591,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -23223,268 +21636,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRAW",
-   "linker_set_key" : "I444ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24",
-   "linker_set_key" : "I444ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Matrix",
-   "linker_set_key" : "I444ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_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"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -23520,7 +21678,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -23556,7 +21714,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_AVX2",
@@ -23583,7 +21741,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_AVX2",
@@ -23610,7 +21768,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -23637,7 +21795,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -23661,7 +21819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_AVX2",
@@ -23685,7 +21843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_AVX2",
@@ -23709,7 +21867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_SSSE3",
@@ -23733,7 +21891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -23757,7 +21915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_SSSE3",
@@ -23781,7 +21939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -23808,7 +21966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_SSE2",
@@ -23826,7 +21984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -23844,7 +22002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_SSE2",
@@ -23862,7 +22020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -23901,7 +22059,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -23940,7 +22098,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -23979,7 +22137,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -24018,7 +22176,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -24057,7 +22215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -24096,7 +22254,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -24135,7 +22293,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -24174,7 +22332,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -24213,7 +22371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -24234,7 +22392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -24267,7 +22425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -24312,7 +22470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -24351,7 +22509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -24390,7 +22548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -24435,7 +22593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -24474,79 +22632,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MM21ToYUY2",
-   "linker_set_key" : "MM21ToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MT2TToP010",
-   "linker_set_key" : "MT2TToP010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -24558,7 +22644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -24606,7 +22692,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_AVX2",
@@ -24636,7 +22722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_AVX2",
@@ -24666,7 +22752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -24696,7 +22782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -24744,7 +22830,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_AVX2",
@@ -24774,7 +22860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_AVX2",
@@ -24804,7 +22890,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -24834,7 +22920,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -24879,7 +22965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_AVX2",
@@ -24906,7 +22992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_AVX2",
@@ -24933,7 +23019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_SSE2",
@@ -24960,7 +23046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -24987,7 +23073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_SSE2",
@@ -25014,7 +23100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -25053,7 +23139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_Any_SSSE3",
@@ -25077,7 +23163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -25101,7 +23187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_SSSE3",
@@ -25125,7 +23211,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -25158,7 +23244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -25194,7 +23280,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_AVX2",
@@ -25218,7 +23304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_AVX2",
@@ -25242,7 +23328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -25266,7 +23352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_AVX2",
@@ -25287,28 +23373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_AVX2",
@@ -25329,28 +23394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_SSE2",
@@ -25371,7 +23415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -25392,7 +23436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_SSE2",
@@ -25413,7 +23457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -25455,7 +23499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_AVX2",
@@ -25482,7 +23526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_AVX2",
@@ -25509,7 +23553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -25536,7 +23580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_AVX2",
@@ -25563,7 +23607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_AVX2",
@@ -25590,7 +23634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -25617,7 +23661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_AVX2",
@@ -25644,7 +23688,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_AVX2",
@@ -25671,7 +23715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -25698,7 +23742,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_AVX2",
@@ -25722,7 +23766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_AVX2",
@@ -25746,7 +23790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_SSE2",
@@ -25770,7 +23814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -25794,7 +23838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_SSE2",
@@ -25818,7 +23862,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -25830,7 +23874,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -25857,25 +23901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::MirrorRow_16_C",
-   "linker_set_key" : "MirrorRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_AVX2",
@@ -25893,7 +23919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_AVX2",
@@ -25911,7 +23937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_SSSE3",
@@ -25929,7 +23955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -25947,7 +23973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_SSSE3",
@@ -25965,7 +23991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -25986,7 +24012,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_SSSE3",
@@ -26007,7 +24033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -26034,7 +24060,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_AVX2",
@@ -26052,7 +24078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_AVX2",
@@ -26070,7 +24096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_SSSE3",
@@ -26088,7 +24114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -26106,7 +24132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_SSSE3",
@@ -26124,7 +24150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_AVX2",
@@ -26145,7 +24171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_AVX2",
@@ -26166,7 +24192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -26187,7 +24213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -26226,7 +24252,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -26265,7 +24291,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -26313,7 +24339,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -26346,7 +24372,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -26379,7 +24405,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -26415,7 +24441,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_AVX2",
@@ -26439,7 +24465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_AVX2",
@@ -26463,7 +24489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_SSSE3",
@@ -26487,7 +24513,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -26511,7 +24537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_SSSE3",
@@ -26535,7 +24561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -26580,7 +24606,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -26628,7 +24654,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -26667,7 +24693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -26700,7 +24726,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -26733,7 +24759,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -26769,7 +24795,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_AVX2",
@@ -26793,7 +24819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_AVX2",
@@ -26817,7 +24843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_SSSE3",
@@ -26841,7 +24867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -26865,7 +24891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_SSSE3",
@@ -26889,7 +24915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -26922,7 +24948,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -26958,7 +24984,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_AVX2",
@@ -26982,7 +25008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_AVX2",
@@ -27006,7 +25032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_SSSE3",
@@ -27030,7 +25056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -27054,7 +25080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_SSSE3",
@@ -27078,7 +25104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -27117,7 +25143,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -27156,7 +25182,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -27189,7 +25215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -27222,7 +25248,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -27258,7 +25284,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_AVX2",
@@ -27282,7 +25308,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_AVX2",
@@ -27306,7 +25332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_SSSE3",
@@ -27330,7 +25356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -27354,7 +25380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_SSSE3",
@@ -27378,7 +25404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -27423,7 +25449,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -27462,7 +25488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -27495,7 +25521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -27528,7 +25554,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -27564,7 +25590,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_AVX2",
@@ -27588,7 +25614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_AVX2",
@@ -27612,7 +25638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_SSSE3",
@@ -27636,7 +25662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -27660,7 +25686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_SSSE3",
@@ -27684,7 +25710,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -27717,7 +25743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_AVX2",
@@ -27738,7 +25764,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_AVX2",
@@ -27759,7 +25785,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_SSSE3",
@@ -27780,7 +25806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -27801,7 +25827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_SSSE3",
@@ -27822,7 +25848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -27858,7 +25884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -27897,7 +25923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -27933,7 +25959,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -27972,52 +25998,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::P010ToI010",
-   "linker_set_key" : "P010ToI010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -28056,52 +26037,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::P012ToI012",
-   "linker_set_key" : "P012ToI012",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -28137,7 +26073,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -28176,7 +26112,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_AVX2",
@@ -28200,7 +26136,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_AVX2",
@@ -28224,7 +26160,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_SSSE3",
@@ -28248,7 +26184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -28272,7 +26208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_SSSE3",
@@ -28296,7 +26232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -28332,7 +26268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -28371,7 +26307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_AVX2",
@@ -28395,7 +26331,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_AVX2",
@@ -28419,7 +26355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_SSSE3",
@@ -28443,7 +26379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -28467,7 +26403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_SSSE3",
@@ -28491,7 +26427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -28530,7 +26466,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_AVX2",
@@ -28554,7 +26490,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_AVX2",
@@ -28578,7 +26514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_SSSE3",
@@ -28602,7 +26538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -28626,7 +26562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_SSSE3",
@@ -28650,7 +26586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_AVX2",
@@ -28674,7 +26610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_AVX2",
@@ -28698,7 +26634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_SSSE3",
@@ -28722,7 +26658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -28746,7 +26682,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_SSSE3",
@@ -28770,7 +26706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -28797,7 +26733,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_SSSE3",
@@ -28815,7 +26751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -28833,7 +26769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_SSSE3",
@@ -28851,7 +26787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -28890,7 +26826,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -28917,7 +26853,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -28956,7 +26892,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -28989,7 +26925,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -29016,7 +26952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_SSSE3",
@@ -29034,7 +26970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -29052,7 +26988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_SSSE3",
@@ -29070,7 +27006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -29097,7 +27033,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_SSSE3",
@@ -29115,7 +27051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -29133,7 +27069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_SSSE3",
@@ -29151,7 +27087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -29175,7 +27111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -29199,7 +27135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_AVX2",
@@ -29217,7 +27153,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_AVX2",
@@ -29235,7 +27171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_SSSE3",
@@ -29253,7 +27189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -29271,7 +27207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_SSSE3",
@@ -29289,7 +27225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -29307,7 +27243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -29334,7 +27270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_SSSE3",
@@ -29352,7 +27288,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -29370,7 +27306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_SSSE3",
@@ -29388,7 +27324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -29415,7 +27351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_SSSE3",
@@ -29433,7 +27369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -29451,7 +27387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_SSSE3",
@@ -29469,7 +27405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -29508,7 +27444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -29535,7 +27471,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -29574,7 +27510,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -29598,7 +27534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -29622,7 +27558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_AVX2",
@@ -29640,7 +27576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_AVX2",
@@ -29658,7 +27594,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_SSSE3",
@@ -29676,7 +27612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -29694,7 +27630,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_SSSE3",
@@ -29712,7 +27648,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -29730,7 +27666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -29757,7 +27693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_SSE2",
@@ -29775,7 +27711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -29793,7 +27729,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_SSE2",
@@ -29811,7 +27747,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -29850,7 +27786,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -29874,7 +27810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -29892,7 +27828,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -29919,7 +27855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -29958,7 +27894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -29985,31 +27921,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::RGBAToUVJRow_C",
-   "linker_set_key" : "RGBAToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_SSSE3",
@@ -30033,7 +27945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -30057,7 +27969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_SSSE3",
@@ -30081,7 +27993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_AVX2",
@@ -30099,7 +28011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_AVX2",
@@ -30117,7 +28029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_SSSE3",
@@ -30135,7 +28047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -30153,7 +28065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_SSSE3",
@@ -30171,7 +28083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_SSSE3",
@@ -30189,7 +28101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -30207,7 +28119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_SSSE3",
@@ -30225,7 +28137,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -30255,7 +28167,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -30285,7 +28197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -30303,7 +28215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_X86",
@@ -30321,7 +28233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -30357,19 +28269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_rgb.h"
-  },
-  {
-   "function_name" : "libyuv::RiscvCpuCaps",
-   "linker_set_key" : "RiscvCpuCaps",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -30399,7 +28299,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -30426,7 +28326,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -30453,7 +28353,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -30480,37 +28380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
-  },
-  {
-   "function_name" : "libyuv::RotatePlane_16",
-   "linker_set_key" : "RotatePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -30570,7 +28440,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -30594,7 +28464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -30618,7 +28488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_SSE2",
@@ -30642,7 +28512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -30666,7 +28536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_SSE2",
@@ -30690,7 +28560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -30714,7 +28584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -30738,7 +28608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_SSSE3",
@@ -30762,7 +28632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_SSE2",
@@ -30783,7 +28653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -30804,7 +28674,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_SSE2",
@@ -30825,7 +28695,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_SSE2",
@@ -30846,7 +28716,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -30867,7 +28737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_SSE2",
@@ -30888,7 +28758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_SSE2",
@@ -30909,7 +28779,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -30930,7 +28800,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_SSE2",
@@ -30951,7 +28821,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_SSE2",
@@ -30975,7 +28845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -30999,7 +28869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_SSE2",
@@ -31023,7 +28893,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_SSE2",
@@ -31047,7 +28917,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -31071,7 +28941,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_SSE2",
@@ -31095,7 +28965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -31113,7 +28983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_AVX2",
@@ -31131,7 +29001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_AVX2",
@@ -31149,7 +29019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_SSE2",
@@ -31167,7 +29037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -31185,7 +29055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_SSE2",
@@ -31203,7 +29073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -31227,7 +29097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -31251,7 +29121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_SSE2",
@@ -31275,7 +29145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -31299,7 +29169,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -31323,7 +29193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -31347,7 +29217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -31371,7 +29241,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -31395,7 +29265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -31419,7 +29289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_SSSE3",
@@ -31443,7 +29313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -31467,7 +29337,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -31488,7 +29358,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -31524,46 +29394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScalePlaneDown2_16To8",
-   "linker_set_key" : "ScalePlaneDown2_16To8",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -31608,7 +29439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -31653,7 +29484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -31701,7 +29532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -31737,7 +29568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -31773,55 +29604,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -31842,7 +29625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_AVX2",
@@ -31863,7 +29646,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_AVX2",
@@ -31884,7 +29667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_SSSE3",
@@ -31905,7 +29688,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -31926,7 +29709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_AVX2",
@@ -31947,7 +29730,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -31968,7 +29751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_SSSE3",
@@ -31989,7 +29772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_SSSE3",
@@ -32010,55 +29793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -32079,7 +29814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_AVX2",
@@ -32100,7 +29835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_AVX2",
@@ -32121,7 +29856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_SSSE3",
@@ -32142,7 +29877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -32163,7 +29898,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_SSSE3",
@@ -32184,55 +29919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -32253,7 +29940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_AVX2",
@@ -32274,7 +29961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_AVX2",
@@ -32295,7 +29982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_SSSE3",
@@ -32316,7 +30003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -32337,7 +30024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_SSSE3",
@@ -32358,7 +30045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -32379,7 +30066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_SSSE3",
@@ -32400,7 +30087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -32421,7 +30108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_SSSE3",
@@ -32442,7 +30129,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -32463,7 +30150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -32484,7 +30171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_SSSE3",
@@ -32505,7 +30192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -32526,7 +30213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_SSSE3",
@@ -32547,7 +30234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_SSSE3",
@@ -32568,7 +30255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -32589,7 +30276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_SSSE3",
@@ -32610,7 +30297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -32631,7 +30318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -32652,7 +30339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_SSSE3",
@@ -32673,7 +30360,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -32694,7 +30381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_SSSE3",
@@ -32715,7 +30402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -32736,7 +30423,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_SSSE3",
@@ -32757,7 +30444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -32778,7 +30465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_SSSE3",
@@ -32799,7 +30486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_SSSE3",
@@ -32820,7 +30507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -32841,7 +30528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_SSSE3",
@@ -32862,7 +30549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -32883,7 +30570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_AVX2",
@@ -32904,7 +30591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_AVX2",
@@ -32925,7 +30612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_SSSE3",
@@ -32946,7 +30633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -32967,7 +30654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_SSSE3",
@@ -32988,7 +30675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -33009,7 +30696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_AVX2",
@@ -33030,7 +30717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_AVX2",
@@ -33051,7 +30738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_SSSE3",
@@ -33072,7 +30759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -33093,7 +30780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_SSSE3",
@@ -33114,7 +30801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_AVX2",
@@ -33138,7 +30825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_AVX2",
@@ -33162,7 +30849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_SSSE3",
@@ -33186,7 +30873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_SSSE3",
@@ -33210,7 +30897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_AVX2",
@@ -33234,7 +30921,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_AVX2",
@@ -33258,7 +30945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -33282,7 +30969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_SSE2",
@@ -33306,7 +30993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -33330,7 +31017,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_SSE2",
@@ -33354,7 +31041,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_AVX2",
@@ -33378,7 +31065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_AVX2",
@@ -33402,7 +31089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -33426,7 +31113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSE2",
@@ -33450,7 +31137,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSSE3",
@@ -33474,7 +31161,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -33498,7 +31185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSE2",
@@ -33522,7 +31209,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSSE3",
@@ -33546,7 +31233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_AVX2",
@@ -33564,7 +31251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_AVX2",
@@ -33582,7 +31269,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_SSSE3",
@@ -33600,7 +31287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_SSSE3",
@@ -33618,7 +31305,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_AVX2",
@@ -33636,7 +31323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_AVX2",
@@ -33654,7 +31341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -33672,7 +31359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_SSE2",
@@ -33690,7 +31377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -33708,7 +31395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_SSE2",
@@ -33726,7 +31413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_AVX2",
@@ -33744,7 +31431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_AVX2",
@@ -33762,7 +31449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -33780,7 +31467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSE2",
@@ -33798,7 +31485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSSE3",
@@ -33816,7 +31503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -33834,7 +31521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSE2",
@@ -33852,7 +31539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSSE3",
@@ -33870,7 +31557,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -33891,7 +31578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -33927,7 +31614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -33948,7 +31635,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -33972,7 +31659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -33996,7 +31683,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -34020,7 +31707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -34044,7 +31731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -34068,7 +31755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_AVX2",
@@ -34089,7 +31776,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_AVX2",
@@ -34110,7 +31797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_SSSE3",
@@ -34131,7 +31818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -34152,7 +31839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_SSSE3",
@@ -34173,7 +31860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -34194,7 +31881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -34215,7 +31902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -34239,7 +31926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -34263,7 +31950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_AVX2",
@@ -34287,7 +31974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_AVX2",
@@ -34311,7 +31998,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -34335,7 +32022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_SSE41",
@@ -34359,7 +32046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -34383,7 +32070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_SSE41",
@@ -34407,7 +32094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_AVX2",
@@ -34431,7 +32118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_AVX2",
@@ -34455,7 +32142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -34479,7 +32166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_SSSE3",
@@ -34503,7 +32190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -34527,7 +32214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_SSSE3",
@@ -34551,7 +32238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_AVX2",
@@ -34569,7 +32256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_AVX2",
@@ -34587,7 +32274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -34605,7 +32292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_SSE41",
@@ -34623,7 +32310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -34641,7 +32328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_SSE41",
@@ -34659,7 +32346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_AVX2",
@@ -34677,7 +32364,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_AVX2",
@@ -34695,7 +32382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -34713,7 +32400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_SSSE3",
@@ -34731,7 +32418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -34749,7 +32436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_SSSE3",
@@ -34767,7 +32454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -34791,7 +32478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_X86",
@@ -34809,7 +32496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -34827,7 +32514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_ERMS",
@@ -34845,7 +32532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_X86",
@@ -34863,7 +32550,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_SSE2",
@@ -34884,7 +32571,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -34905,7 +32592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_SSE2",
@@ -34926,7 +32613,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_SSE2",
@@ -34947,7 +32634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -34968,7 +32655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_SSE2",
@@ -34989,7 +32676,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -35013,7 +32700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_SSE2",
@@ -35037,7 +32724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_SSE2",
@@ -35058,7 +32745,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -35079,7 +32766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_SSE2",
@@ -35100,7 +32787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -35121,7 +32808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_SSE2",
@@ -35142,7 +32829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -35187,7 +32874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_AVX2",
@@ -35214,7 +32901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_AVX2",
@@ -35241,7 +32928,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSE2",
@@ -35268,7 +32955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSSE3",
@@ -35295,7 +32982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -35322,7 +33009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSE2",
@@ -35349,7 +33036,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSSE3",
@@ -35376,7 +33063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -35415,7 +33102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_SSSE3",
@@ -35439,7 +33126,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -35463,7 +33150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_SSSE3",
@@ -35487,7 +33174,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -35523,7 +33210,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -35556,7 +33243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -35589,7 +33276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -35622,7 +33309,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -35655,7 +33342,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -35688,7 +33375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -35724,7 +33411,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_AVX2",
@@ -35748,7 +33435,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_AVX2",
@@ -35772,7 +33459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -35796,7 +33483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_AVX2",
@@ -35817,7 +33504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_AVX2",
@@ -35838,7 +33525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_SSE2",
@@ -35859,7 +33546,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -35880,7 +33567,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_SSE2",
@@ -35901,7 +33588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_AVX2",
@@ -35925,7 +33612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_AVX2",
@@ -35949,7 +33636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSE2",
@@ -35973,7 +33660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSSE3",
@@ -35997,7 +33684,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -36021,7 +33708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSE2",
@@ -36045,7 +33732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSSE3",
@@ -36069,7 +33756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -36084,7 +33771,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -36102,7 +33789,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_SSE2",
@@ -36120,7 +33807,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -36147,7 +33834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_AVX2",
@@ -36165,7 +33852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_AVX2",
@@ -36183,7 +33870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_SSSE3",
@@ -36201,7 +33888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -36219,7 +33906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_SSSE3",
@@ -36237,79 +33924,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -36336,7 +33951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -36366,7 +33981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -36399,31 +34014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWx8_16_C",
-   "linker_set_key" : "TransposeWx8_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_SSSE3",
@@ -36447,7 +34038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -36471,7 +34062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_SSSE3",
@@ -36495,34 +34086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWxH_16_C",
-   "linker_set_key" : "TransposeWxH_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -36549,7 +34113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -36588,7 +34152,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -36627,7 +34191,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -36666,7 +34230,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -36705,7 +34269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -36744,7 +34308,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -36783,7 +34347,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -36822,7 +34386,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -36861,7 +34425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -36900,7 +34464,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -36939,7 +34503,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -36978,7 +34542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -37017,7 +34581,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -37056,7 +34620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -37095,7 +34659,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -37122,7 +34686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_AVX2",
@@ -37143,7 +34707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_AVX2",
@@ -37164,7 +34728,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_SSSE3",
@@ -37185,7 +34749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -37206,7 +34770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_SSSE3",
@@ -37227,7 +34791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -37266,7 +34830,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -37305,7 +34869,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -37338,7 +34902,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_AVX2",
@@ -37359,7 +34923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_AVX2",
@@ -37380,7 +34944,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_SSE2",
@@ -37401,7 +34965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -37422,7 +34986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_SSE2",
@@ -37443,7 +35007,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_AVX2",
@@ -37467,7 +35031,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_AVX2",
@@ -37491,7 +35055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_SSE2",
@@ -37515,7 +35079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -37539,7 +35103,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_SSE2",
@@ -37563,7 +35127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -37590,7 +35154,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_AVX2",
@@ -37608,7 +35172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_AVX2",
@@ -37626,7 +35190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_SSE2",
@@ -37644,7 +35208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -37662,7 +35226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_SSE2",
@@ -37680,25 +35244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_C",
-   "linker_set_key" : "UnpackMT2T_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -37713,7 +35259,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -37740,7 +35286,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_AVX2",
@@ -37761,7 +35307,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_AVX2",
@@ -37782,7 +35328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_SSSE3",
@@ -37803,7 +35349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -37824,7 +35370,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_SSSE3",
@@ -37845,7 +35391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -37884,7 +35430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -37923,7 +35469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -37956,112 +35502,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_AVX2",
@@ -38082,7 +35523,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_AVX2",
@@ -38103,7 +35544,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_SSE2",
@@ -38124,7 +35565,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -38145,7 +35586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_SSE2",
@@ -38166,7 +35607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_AVX2",
@@ -38190,7 +35631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_AVX2",
@@ -38214,7 +35655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_SSE2",
@@ -38238,7 +35679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -38262,7 +35703,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_SSE2",
@@ -38286,7 +35727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -38313,7 +35754,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_AVX2",
@@ -38331,7 +35772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_AVX2",
@@ -38349,7 +35790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_SSE2",
@@ -38367,7 +35808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -38385,7 +35826,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_SSE2",
@@ -38403,7 +35844,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -38417,7 +35858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -38430,7 +35871,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38444,7 +35885,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -38457,7 +35898,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -38479,7 +35920,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -38504,7 +35945,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -38520,7 +35961,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -38533,7 +35974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -38549,7 +35990,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -38565,7 +36006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38582,7 +36023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -38598,7 +36039,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -38614,7 +36055,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -38630,7 +36071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38647,7 +36088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38661,7 +36102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -38677,7 +36118,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -38693,7 +36134,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -38711,7 +36152,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -38724,7 +36165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -38740,7 +36181,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -38753,7 +36194,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -38766,7 +36207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -38785,7 +36226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -38798,7 +36239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -38811,7 +36252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -38824,7 +36265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -38837,7 +36278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -38846,121 +36287,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -38973,7 +36414,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -38982,7 +36423,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -38991,7 +36432,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39000,7 +36441,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39009,7 +36450,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -39018,7 +36459,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39027,7 +36468,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39036,7 +36477,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -39045,7 +36486,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39054,7 +36495,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39063,16 +36504,7 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKj",
-   "name" : "const unsigned int *",
-   "referenced_type" : "_ZTIKj",
-   "self_type" : "_ZTIPKj",
-   "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39081,7 +36513,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -39090,7 +36522,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39099,7 +36531,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39108,7 +36540,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39117,7 +36549,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39126,7 +36558,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39135,7 +36567,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39144,7 +36576,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -39153,7 +36585,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39162,7 +36594,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "alignment" : 4,
@@ -39171,7 +36603,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -39180,7 +36612,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -39193,7 +36625,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 2,
@@ -39203,7 +36635,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -39213,7 +36645,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -39223,7 +36655,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -39233,7 +36665,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -39243,7 +36675,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -39253,7 +36685,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39263,7 +36695,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39273,7 +36705,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -39283,7 +36715,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -39312,7 +36744,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39390,7 +36822,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -39426,7 +36858,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -39447,7 +36879,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/34/64/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 7fde65d7..e5ed02cf 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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2936,7 +2936,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "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" : 4278190080,
+     "enum_field_value" : -16777216,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/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 daad1f5d..4b44d430 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : -281474976710656,
+     "enum_field_value" : 0,
      "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 cb030491..81e19524 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 a3384611..b73dcd26 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4275,11 +4275,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4860,11 +4860,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 ed23b9ac..13f96113 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : -281474976710656,
+     "enum_field_value" : 0,
      "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 0f79c8d2..805319dd 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 9feffb4a..996c09e9 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3447,11 +3447,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 b45e2129..fe2700f9 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3464,11 +3464,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4049,11 +4049,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 672a6f75..cc44d120 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 08d4f490..d68c8619 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3819,11 +3819,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 40b1a667..bc14939e 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3857,11 +3857,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4442,11 +4442,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 33f49765..4522d5fd 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3953,11 +3953,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4538,11 +4538,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 91791fb1..d7606415 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 47251043..e00a2849 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 454fc1bc..410ea9f8 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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3687,7 +3687,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "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" : 4278190080,
+     "enum_field_value" : -16777216,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/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 225bee1e..f112a5c1 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,31 +978,6 @@
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -18224,7 +18199,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -18233,7 +18208,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -18248,7 +18223,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -18257,7 +18232,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -18272,7 +18247,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -18281,7 +18256,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -18296,7 +18271,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -18305,7 +18280,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -40085,7 +40060,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -45055,7 +45030,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -45095,7 +45070,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -45105,7 +45080,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -45115,7 +45090,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -46050,7 +46025,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -46059,7 +46034,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -46151,7 +46126,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -46160,7 +46135,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
diff --git a/34/64/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 1f1ca110..b72a37d1 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,12 +5964,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
diff --git a/34/64/x86_64/source-based/libRSCpuRef.so.lsdump b/34/64/x86_64/source-based/libRSCpuRef.so.lsdump
index 2edfc335..fdf419f2 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -331,7 +331,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -673,7 +673,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -3692,83 +3692,6 @@
    [
     {
      "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"
     },
     {
@@ -7154,7 +7077,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -7170,11 +7093,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -7183,7 +7106,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7432,31 +7355,6 @@
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -11108,7 +11006,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11126,7 +11024,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11159,7 +11057,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11174,7 +11072,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11192,7 +11090,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11210,7 +11108,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11237,7 +11135,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11273,7 +11171,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11291,7 +11189,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11312,7 +11210,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11336,7 +11234,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11372,7 +11270,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11411,7 +11309,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11447,7 +11345,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11486,7 +11384,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11519,7 +11417,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11537,7 +11435,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11654,7 +11552,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11675,7 +11573,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23840,7 +23738,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23849,7 +23747,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23903,7 +23801,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -23921,7 +23819,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24029,7 +23927,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24038,7 +23936,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24389,7 +24287,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24398,7 +24296,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24407,7 +24305,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24416,7 +24314,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24425,7 +24323,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24434,7 +24332,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24443,7 +24341,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24461,7 +24359,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24470,7 +24368,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24479,7 +24377,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24488,7 +24386,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24497,7 +24395,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24506,7 +24404,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24515,7 +24413,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24524,7 +24422,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24533,7 +24431,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24542,7 +24440,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24605,7 +24503,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24614,7 +24512,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -25172,7 +25070,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25217,7 +25115,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -25226,7 +25124,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -25376,8 +25274,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25826,8 +25724,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -31886,7 +31784,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -31940,7 +31838,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -32665,7 +32563,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -32715,7 +32613,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -32725,7 +32623,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36428,7 +36326,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/e560d7b19ebf7276b3e850d3d346dec8/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/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 8,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -37892,7 +37790,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -37948,7 +37846,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 16,
@@ -38877,7 +38775,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -39244,7 +39142,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -39849,7 +39747,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -39986,7 +39884,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -48373,7 +48271,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48454,7 +48352,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49229,7 +49127,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -49246,7 +49144,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -49256,7 +49154,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -49273,7 +49171,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -58427,7 +58325,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -58436,7 +58334,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -58451,7 +58349,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -58460,7 +58358,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -58475,7 +58373,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -58484,7 +58382,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -58499,7 +58397,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -58508,7 +58406,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -131507,7 +131405,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -131516,7 +131414,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -131534,7 +131432,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
-   "name" : "std::__make_tuple_indices<2>",
+   "name" : "std::__make_tuple_indices<2, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "size" : 1,
@@ -153562,7 +153460,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -153602,7 +153500,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -153612,7 +153510,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -153622,7 +153520,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -153725,7 +153623,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -153839,7 +153737,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -153953,7 +153851,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -154052,7 +153950,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -155023,7 +154921,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -155032,7 +154930,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -155124,7 +155022,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -155133,7 +155031,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
diff --git a/34/64/x86_64/source-based/libRSDriver.so.lsdump b/34/64/x86_64/source-based/libRSDriver.so.lsdump
index c4addde8..c5a6fbc2 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6082,31 +6082,6 @@
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -10469,7 +10444,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10493,7 +10468,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11180,7 +11155,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -25113,8 +25088,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -30962,7 +30937,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -69259,7 +69234,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
diff --git a/34/64/x86_64/source-based/libRS_internal.so.lsdump b/34/64/x86_64/source-based/libRS_internal.so.lsdump
index 99107601..d928ba2e 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8589,31 +8589,6 @@
    "underlying_type" : "_ZTIj"
   },
   {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 18446744073709551615,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551614,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 18446744073709551613,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
-   "underlying_type" : "_ZTIm"
-  },
-  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -32012,7 +31987,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "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" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37904,8 +37879,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/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",
+   "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",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -38147,8 +38122,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38156,8 +38131,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38165,8 +38140,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38174,8 +38149,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -74776,7 +74751,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -74785,7 +74760,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -74800,7 +74775,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -74809,7 +74784,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -74824,7 +74799,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -74833,7 +74808,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -74848,7 +74823,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -74857,7 +74832,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -127499,7 +127474,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -141293,7 +141268,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -141436,7 +141411,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -149149,7 +149124,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -158702,7 +158677,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -158742,7 +158717,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -158752,7 +158727,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -158762,7 +158737,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -159645,7 +159620,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -159654,7 +159629,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -159746,7 +159721,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -159755,7 +159730,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
diff --git a/34/64/x86_64/source-based/libaudioutils.so.lsdump b/34/64/x86_64/source-based/libaudioutils.so.lsdump
index 456426e3..7f19ab2d 100644
--- a/34/64/x86_64/source-based/libaudioutils.so.lsdump
+++ b/34/64/x86_64/source-based/libaudioutils.so.lsdump
@@ -1760,14 +1760,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLm5EEELm3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE25__emplace_unique_key_argsIjJRKNS_4pairIKjS6_EEEEENSK_INS_15__hash_iteratorIPNS_11__hash_nodeIS7_PvEEEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLm5EEELm3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE8__rehashEm"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112basic_stringIhNS_11char_traitsIhEENS_9allocatorIhEEE21__grow_by_and_replaceEmmmmmmPKh"
   },
   {
@@ -2975,7 +2967,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3213,119 +3205,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 2214592512,
+     "enum_field_value" : -2080374784,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : 2281701376,
+     "enum_field_value" : -2013265920,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : 2281701377,
+     "enum_field_value" : -2013265919,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : 2415919104,
+     "enum_field_value" : -1879048192,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : 2684354560,
+     "enum_field_value" : -1610612736,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3337,15 +3329,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4148,15 +4140,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 3743416319,
+     "enum_field_value" : -551550977,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4638,99 +4630,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : 2147484159,
+     "enum_field_value" : -2147483137,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : 2147484671,
+     "enum_field_value" : -2147482625,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : 2147485695,
+     "enum_field_value" : -2147481601,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : 2147487743,
+     "enum_field_value" : -2147479553,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : 2147491839,
+     "enum_field_value" : -2147475457,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : 2147500031,
+     "enum_field_value" : -2147467265,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : 2147516415,
+     "enum_field_value" : -2147450881,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : 2147549183,
+     "enum_field_value" : -2147418113,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : 2147614719,
+     "enum_field_value" : -2147352577,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : 2147745791,
+     "enum_field_value" : -2147221505,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : 2148007935,
+     "enum_field_value" : -2146959361,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : 2148532223,
+     "enum_field_value" : -2146435073,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : 2149580799,
+     "enum_field_value" : -2145386497,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : 2151677951,
+     "enum_field_value" : -2143289345,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : 2155872255,
+     "enum_field_value" : -2139095041,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : 2164260863,
+     "enum_field_value" : -2130706433,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4746,7 +4738,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5468,7 +5460,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5543,7 +5535,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5564,7 +5556,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -12455,7 +12447,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfmmmS1_S3_mN7android11audio_utils7details13FILTER_OPTIONEELm32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -14229,7 +14221,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 8,
@@ -19388,7 +19380,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/x86_64/source-based/libbase.so.lsdump b/34/64/x86_64/source-based/libbase.so.lsdump
index 3ba235b1..f9d589a0 100644
--- a/34/64/x86_64/source-based/libbase.so.lsdump
+++ b/34/64/x86_64/source-based/libbase.so.lsdump
@@ -1093,21 +1093,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -1966,7 +1957,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -2017,7 +2008,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2773,7 +2764,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLm500ENSt3__19allocatorIcEEE4growEm",
    "parameters" :
    [
@@ -2807,7 +2798,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLm500ENSt3__19allocatorIwEEE4growEm",
    "parameters" :
    [
@@ -4974,23 +4965,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -5009,22 +4983,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -5041,22 +4999,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
diff --git a/34/64/x86_64/source-based/libbinder.so.lsdump b/34/64/x86_64/source-based/libbinder.so.lsdump
index c0f92f67..3d8a5392 100644
--- a/34/64/x86_64/source-based/libbinder.so.lsdump
+++ b/34/64/x86_64/source-based/libbinder.so.lsdump
@@ -73,15 +73,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA1_Ds",
-   "name" : "char16_t[1]",
-   "referenced_type" : "_ZTIDs",
-   "self_type" : "_ZTIA1_Ds",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 16,
    "linker_set_key" : "_ZTIA1_N3fmt2v76detail5valueINS0_20basic_format_contextINS1_15buffer_appenderIcEEcEEEE",
    "name" : "fmt::detail::value<fmt::basic_format_context<fmt::detail::buffer_appender<char>, char>>[1]",
@@ -100,6 +91,15 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "linker_set_key" : "_ZTIA20_Ds",
+   "name" : "char16_t[20]",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIA20_Ds",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA20_m",
    "name" : "unsigned long[20]",
@@ -1083,6 +1083,34 @@
    "name" : "_ZN7android10zeroMemoryEPhm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv"
+  },
+  {
    "name" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE"
   },
   {
@@ -1854,6 +1882,214 @@
    "name" : "_ZN7android2os20ParcelFileDescriptorD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9HeapCacheEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_"
+  },
+  {
    "name" : "_ZN7android33makeDefaultRpcTransportCtxFactoryEv"
   },
   {
@@ -1938,21 +2174,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -2118,6 +2345,22 @@
    "name" : "_ZN7android4base8EndsWithENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEc"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIlEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_"
+  },
+  {
    "name" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_"
   },
   {
@@ -2133,6 +2376,22 @@
    "name" : "_ZN7android4base9ParseBoolENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintImEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b"
+  },
+  {
    "name" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvm"
   },
   {
@@ -2322,9 +2581,6 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
-   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
-  },
-  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2532,9 +2788,6 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
-   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
-  },
-  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3072,9 +3325,6 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
-   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
-  },
-  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3285,10 +3535,7 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE"
-  },
-  {
-   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3606,6 +3853,22 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedImEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
+  },
+  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3735,9 +3998,6 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
-   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
-  },
-  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3756,6 +4016,14 @@
    "name" : "_ZNK7android6Parcel16readStrongBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorImNS1_9allocatorImEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3939,6 +4207,198 @@
    "name" : "_ZNK7android6Parcel9readInt64Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
+  },
+  {
    "name" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE"
   },
   {
@@ -4045,10 +4505,410 @@
   },
   {
    "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_"
   },
   {
@@ -4057,9 +4917,1269 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE8overflowEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9pbackfailEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9underflowEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__construct_nodeIJRS5_EEENS_10unique_ptrINS_11__tree_nodeIS5_PvEENS_22__tree_node_destructorINS8_ISG_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSF_SF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE25__emplace_unique_key_argsIS5_JRS5_EEENS_4pairINS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE12__find_equalIS2_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISC_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSC_SC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE25__emplace_unique_key_argsIS2_JRKS2_EEENS_4pairINS_15__tree_iteratorIS2_PNS_11__tree_nodeIS2_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISK_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS5_JNS_4pairIKS5_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE4findIS5_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SG_EElEERPNS_15__tree_end_nodeISI_EESJ_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISI_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEEEvT_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE15__emplace_multiIJRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISQ_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_4pairIKS3_S5_EEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISN_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSI_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEENS_21__tree_const_iteratorIS6_SO_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE8__detachEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EElEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEENS_21__tree_const_iteratorIS8_SP_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIlNS_9allocatorIlEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_4pairIKS3_S3_EEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISL_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EElEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_lEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_lEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEENS_21__tree_const_iteratorIS4_SM_lEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ElEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE13__move_assignERSB_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS2_JRKNS_21piecewise_construct_tENS_5tupleIJOS2_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSO_SO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISW_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSW_SW_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSW_IJEEEEEENS9_INS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE4findIS7_EENS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE5eraseENS_21__tree_const_iteratorISL_PNS_11__tree_nodeISL_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE7destroyEPNS_11__tree_nodeISL_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE13__lower_boundIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEElEERKT_SM_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISK_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE25__emplace_unique_key_argsIS5_JRKNS_21piecewise_construct_tENS_5tupleIJRKS5_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE4findIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE5eraseENS_21__tree_const_iteratorISA_PNS_11__tree_nodeISA_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE7destroyEPNS_11__tree_nodeISA_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSH_SH_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsImJNS_4pairIKmS4_EEEEENSE_INS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeImN7android8RpcState10BinderNodeEEENS_19__map_value_compareImS5_NS_4lessImEELb1EEENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE24__emplace_back_slow_pathIJDsEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE26__swap_out_circular_bufferERNS_14__split_bufferIDsRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE21__push_back_slow_pathIRKS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSessionEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE18__construct_at_endEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6assignIPS2_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS2_NS_15iterator_traitsIS9_E9referenceEEE5valueEvE4typeES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIS6_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE21__push_back_slow_pathISA_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE26__swap_out_circular_bufferERNS_14__split_bufferISA_RSC_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE21__push_back_slow_pathIS8_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE24__emplace_back_slow_pathIJS6_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RSA_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE12__move_rangeEPS1_S5_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertENS_11__wrap_iterIPKS1_EEmRS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPKS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS9_E9referenceEEE5valueENS_11__wrap_iterIPS1_EEE4typeENSD_IS7_EES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIS6_EEE4typeENSC_IPKS1_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELm0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELm0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE9push_backERKb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6assignIPdEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIdNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE26__swap_out_circular_bufferERNS_14__split_bufferIfRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6assignIPiEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIRKjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE26__swap_out_circular_bufferERNS_14__split_bufferIjRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE26__swap_out_circular_bufferERNS_14__split_bufferIlRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE6assignIPlEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIlNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIlNS_9allocatorIlEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorImNS_9allocatorImEEE26__swap_out_circular_bufferERNS_14__split_bufferImRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorImNS_9allocatorImEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorImNS_9allocatorImEEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__19__sift_upIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "_ZThn8_N7android10AllocationD0Ev"
   },
   {
@@ -4321,9 +6441,15 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
+   "name" : "_ZN7android16kEnableRecordingE"
+  },
+  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
+   "name" : "_ZN7android20kEnableRpcDevServersE"
+  },
+  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -4760,6 +6886,10 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android10PoolThreadE"
+  },
+  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -4787,6 +6917,10 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android15BpShellCallbackE"
+  },
+  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -4796,6 +6930,14 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android16BpResultReceiverE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
+  },
+  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -4859,6 +7001,14 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -4927,10 +7077,6 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTVN7android15RpcTransportRawE"
-  },
-  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -4954,10 +7100,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android18RpcTransportCtxRawE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -6526,7 +8668,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -6577,7 +8719,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -10964,6 +13106,104 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemoryHeap>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IShellCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IResultReceiver>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IClientCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceManager>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemory>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
    "function_name" : "android::IMemoryHeap::asInterface",
    "linker_set_key" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE",
    "parameters" :
@@ -13449,6 +15689,849 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::WaitForShutdownListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession23WaitForShutdownListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_12ProcessStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12ProcessStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_12ProcessStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15BpShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android15BpShellCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_16BpResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android16BpResultReceiverE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager::LocalRegistrationCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShimEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android18ServiceManagerShimE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::BufferedTextOutput::BufferState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18BufferedTextOutput11BufferStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os17BpServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os17BpServiceCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::binder::internal::ClientCounterCallbackImpl>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7BBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::clear",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpBinderE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android10AllocationE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpMemoryE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::HeapCache>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_9HeapCacheEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9HeapCacheEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::clear",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h",
+   "template_args" :
+   [
+    "_ZTIN7android10RpcSession23WaitForShutdownListenerE"
+   ]
+  },
+  {
+   "function_name" : "android::wp<android::IBinder::DeathRecipient>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinder14DeathRecipientEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinder14DeathRecipientEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinder14DeathRecipientEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::base::LogMessage::stream",
    "linker_set_key" : "_ZN7android4base10LogMessage6streamEv",
    "parameters" :
@@ -13970,23 +17053,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILl1ELl1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -14005,22 +17071,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -14037,22 +17087,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
@@ -14701,6 +17735,114 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIa"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIlEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPl"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIl"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIl"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIs"
+   ]
+  },
+  {
    "function_name" : "android::base::Readlink",
    "linker_set_key" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_",
    "parameters" :
@@ -14773,6 +17915,114 @@
    "source_file" : "system/libbase/include/android-base/parsebool.h"
   },
   {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIh"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIj"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintImEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPm"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIm"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIt"
+   ]
+  },
+  {
    "function_name" : "android::base::ReadFully",
    "linker_set_key" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvm",
    "parameters" :
@@ -15798,19 +19048,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::setServiceFuzzing",
-   "linker_set_key" : "_ZN7android6Parcel17setServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::writeDoubleVector",
    "linker_set_key" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -16918,12 +20155,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
   },
   {
-   "function_name" : "android::binder::LazyServiceRegistrar::createExtraTestInstance",
-   "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv",
-   "return_type" : "_ZTIN7android6binder20LazyServiceRegistrarE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
-  },
-  {
    "function_name" : "android::binder::LazyServiceRegistrar::setActiveServicesCallback",
    "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE",
    "parameters" :
@@ -17718,7 +20949,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -17732,7 +20962,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -19533,7 +22762,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIb",
+   "return_type" : "_ZTIv",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -19679,7 +22908,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE",
    "parameters" :
    [
     {
@@ -19687,23 +22916,7 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "function_name" : "android::RpcServer::setServerSocketModifier",
-   "linker_set_key" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android9RpcServerE"
-    },
-    {
-     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21619,19 +24832,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::isServiceFuzzing",
-   "linker_set_key" : "_ZNK7android6Parcel16isServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPKN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::readDoubleVector",
    "linker_set_key" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -21722,6 +24922,46 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os15IClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16IServiceCallbackE"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::readUint64Vector",
    "linker_set_key" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorImNS1_9allocatorImEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -22670,6 +25910,1062 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "function_name" : "android::binder::debug::RecordedTransaction::dumpToFile",
    "linker_set_key" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE",
    "parameters" :
@@ -23500,10 +27796,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA1_KDs",
-   "name" : "const char16_t (&)[1]",
-   "referenced_type" : "_ZTIA1_KDs",
-   "self_type" : "_ZTIRA1_KDs",
+   "linker_set_key" : "_ZTIRA20_KDs",
+   "name" : "const char16_t (&)[20]",
+   "referenced_type" : "_ZTIA20_KDs",
+   "self_type" : "_ZTIRA20_KDs",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -23709,7 +28005,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_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -24409,10 +28705,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
-   "name" : "const android::String16::StaticData<1> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
+   "name" : "const android::String16::StaticData<20> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -26448,8 +30744,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_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",
+   "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",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29146,10 +33442,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILm1EEE",
-   "name" : "android::StaticString16<1> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILm1EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILm20EEE",
+   "name" : "android::StaticString16<20> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILm20EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -29830,15 +34126,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession> *",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android2wpINS_7BBinderEEE",
    "name" : "android::wp<android::BBinder> *",
    "referenced_type" : "_ZTIN7android2wpINS_7BBinderEEE",
@@ -30469,10 +34756,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm1EEE",
-   "name" : "android::String16::StaticData<1> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILm1EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm20EEE",
+   "name" : "android::String16::StaticData<20> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILm20EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -31314,16 +35601,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA1_KDs",
-   "name" : "const char16_t[1]",
-   "referenced_type" : "_ZTIA1_Ds",
-   "self_type" : "_ZTIA1_KDs",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIA1_KPKc",
@@ -31334,6 +35611,16 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIA20_KDs",
+   "name" : "const char16_t[20]",
+   "referenced_type" : "_ZTIA20_Ds",
+   "self_type" : "_ZTIA20_KDs",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Km",
@@ -33602,11 +37889,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm1EEE",
-   "name" : "const android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm20EEE",
+   "name" : "const android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -33726,7 +38013,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 448,
+   "size" : 400,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -35137,46 +39424,6 @@
      "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android15RpcTransportRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportCtxRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android18RpcTransportCtxRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
    "name" : "libutilsinternal::is_complete_type<android::Parcel, void>",
    "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
@@ -46674,15 +50921,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILm1EEE",
-   "name" : "android::StaticString16<1>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILm20EEE",
+   "name" : "android::StaticString16<20>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILm1EEE",
-   "size" : 16,
+   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILm20EEE",
+   "size" : 56,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -50153,7 +54400,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/e560d7b19ebf7276b3e850d3d346dec8/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/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -50203,34 +54450,6 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android10RpcSessionE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIPN7android7RefBase12weakref_typeE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "size" : 16,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android10RpcSessionE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "_ZTIPN7android7BBinderE"
     },
     {
@@ -57713,12 +61932,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -59826,14 +64039,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA1_Ds"
+     "referenced_type" : "_ZTIA20_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "name" : "android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "name" : "android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -60275,7 +64488,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 1280,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
     },
     {
      "access" : "private",
@@ -60285,32 +64498,26 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServerSocketModifier",
-     "field_offset" : 2048,
-     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
-    },
-    {
-     "access" : "private",
      "field_name" : "mSessions",
-     "field_offset" : 2432,
+     "field_offset" : 2048,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 2624,
+     "field_offset" : 2240,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 2688,
+     "field_offset" : 2304,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 3072,
+     "field_offset" : 2688,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -60319,12 +64526,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 448,
+   "size" : 400,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 432,
+     "component_value" : 384,
      "kind" : "vbase_offset"
     },
     {
@@ -60361,11 +64568,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -432,
+     "component_value" : -384,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -432,
+     "component_value" : -384,
      "kind" : "offset_to_top"
     },
     {
@@ -61512,10 +65719,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE",
-   "name" : "std::function<sp<IBinder> (wp<RpcSession>, const void *, unsigned long)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE",
-   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE",
+   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE",
+   "name" : "std::function<sp<IBinder> (const void *, unsigned long)> &&",
+   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE",
+   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE",
    "size" : 8,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -61548,15 +65755,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "name" : "std::function<void (borrowed_fd)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "self_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "size" : 8,
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "name" : "std::function<void (LogId, LogSeverity, const char *, const char *, unsigned int, const char *)> &&",
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
diff --git a/34/64/x86_64/source-based/libc++.so.lsdump b/34/64/x86_64/source-based/libc++.so.lsdump
index 93868f5c..cbecffc1 100644
--- a/34/64/x86_64/source-based/libc++.so.lsdump
+++ b/34/64/x86_64/source-based/libc++.so.lsdump
@@ -2613,6 +2613,14 @@
    "name" : "_ZNSt3__112__next_primeEm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__112__rs_defaultC1ERKS0_"
   },
   {
@@ -3775,6 +3783,10 @@
    "name" : "_ZNSt3__114__num_put_base18__identify_paddingEPcS1_RKNS_8ios_baseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__114__shared_count12__add_sharedEv"
   },
   {
@@ -4415,10 +4427,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__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_"
   },
   {
@@ -4434,6 +4470,22 @@
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIssEEPsEEvT0_S5_T_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_"
+  },
+  {
    "name" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE"
   },
   {
@@ -4609,6 +4661,10 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEclEv"
+  },
+  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -4997,10 +5053,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__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_"
   },
   {
@@ -5017,10 +5097,50 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__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_"
   },
   {
@@ -5037,6 +5157,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort5IRNS_6__lessIggEEPgEEjT0_S5_S5_S5_S5_T_"
   },
   {
@@ -9795,7 +9931,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_grouping",
+   "function_name" : "std::moneypunct<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9809,7 +9945,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_neg_format",
+   "function_name" : "std::moneypunct<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9823,7 +9959,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_pos_format",
+   "function_name" : "std::moneypunct<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9837,7 +9973,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9851,7 +9987,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_frac_digits",
+   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9865,7 +10001,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_decimal_point",
+   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -9879,7 +10015,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_negative_sign",
+   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -9893,7 +10029,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_positive_sign",
+   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -9907,7 +10043,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10047,7 +10183,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10061,7 +10197,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10075,7 +10211,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10089,7 +10225,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10103,7 +10239,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10117,7 +10253,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10131,7 +10267,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10145,7 +10281,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10159,7 +10295,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13078,7 +13214,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13092,7 +13228,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13106,7 +13242,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13120,7 +13256,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13134,7 +13270,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13148,7 +13284,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13162,7 +13298,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13176,7 +13312,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13190,7 +13326,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13330,7 +13466,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13344,7 +13480,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13358,7 +13494,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13372,7 +13508,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13386,7 +13522,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13400,7 +13536,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13414,7 +13550,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13428,7 +13564,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13442,7 +13578,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20173,6 +20309,50 @@
    "source_file" : "external/libcxx/include/__hash_table"
   },
   {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPcEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPcEE"
+   ]
+  },
+  {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__rs_default::__rs_default",
    "linker_set_key" : "_ZNSt3__112__rs_defaultC1ERKS0_",
    "parameters" :
@@ -25603,6 +25783,25 @@
    "source_file" : "external/libcxx/include/locale"
   },
   {
+   "function_name" : "std::__rotate_right",
+   "linker_set_key" : "_ZNSt3__114__rotate_rightINS_11__wrap_iterIPwEEEET_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__shared_count::__add_shared",
    "linker_set_key" : "_ZNSt3__114__shared_count12__add_sharedEv",
    "parameters" :
@@ -28353,7 +28552,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char>::init",
+   "function_name" : "std::moneypunct_byname<char, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28387,7 +28586,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28421,6 +28620,121 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__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" :
    [
@@ -28444,6 +28758,29 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_",
    "parameters" :
    [
@@ -28535,6 +28872,98 @@
    ]
   },
   {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "access" : "private",
    "function_name" : "std::__time_get_storage<char>::init",
    "linker_set_key" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE",
@@ -29346,6 +29775,19 @@
    "source_file" : "external/libcxx/include/memory"
   },
   {
+   "function_name" : "std::mersenne_twister_engine<unsigned long, 32, 624, 397, 31, 2567483615, 11, 4294967295, 7, 2636928640, 15, 4022730752, 18, 1812433253>::operator()",
+   "linker_set_key" : "_ZNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEclEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEE"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "external/libcxx/include/random"
+  },
+  {
    "function_name" : "std::__libcpp_debug_exception::__libcpp_debug_exception",
    "linker_set_key" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE",
    "parameters" :
@@ -31386,6 +31828,136 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__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" :
    [
@@ -31412,6 +31984,32 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31515,6 +32113,255 @@
    ]
   },
   {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__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" :
@@ -31545,6 +32392,35 @@
   },
   {
    "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_",
    "parameters" :
    [
@@ -31660,6 +32536,122 @@
    ]
   },
   {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "function_name" : "std::__sort5",
    "linker_set_key" : "_ZNSt3__17__sort5IRNS_6__lessIggEEPgEEjT0_S5_S5_S5_S5_T_",
    "parameters" :
@@ -34544,13 +35536,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char>::id",
+   "name" : "std::moneypunct<char, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char>::intl",
+   "name" : "std::moneypunct<char, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -34568,13 +35560,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t>::id",
+   "name" : "std::moneypunct<wchar_t, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t>::intl",
+   "name" : "std::moneypunct<wchar_t, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -54362,7 +55354,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -54371,7 +55363,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -54386,7 +55378,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -54395,7 +55387,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -54410,7 +55402,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -54419,7 +55411,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -54434,7 +55426,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -54443,7 +55435,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -115735,7 +116727,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -115744,7 +116736,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -136248,7 +137240,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -136258,7 +137250,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
-   "name" : "std::ratio<1000000>",
+   "name" : "std::ratio<1000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
@@ -136298,7 +137290,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -136308,7 +137300,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -136318,7 +137310,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -137569,7 +138561,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -137578,7 +138570,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137587,7 +138579,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
    "size" : 1,
@@ -137601,7 +138593,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137610,7 +138602,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137647,7 +138639,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137656,7 +138648,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137693,7 +138685,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137702,7 +138694,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137739,7 +138731,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137748,7 +138740,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137785,7 +138777,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137794,7 +138786,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137831,7 +138823,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -137840,7 +138832,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137909,7 +138901,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -137918,7 +138910,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -137955,7 +138947,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -137964,7 +138956,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138033,7 +139025,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1000000ELb0EEE",
    "size" : 1,
@@ -138042,7 +139034,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1000000EEEE13__no_overflowINS2_ILl1ELl1EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138157,7 +139149,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138166,7 +139158,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
diff --git a/34/64/x86_64/source-based/libcap.so.lsdump b/34/64/x86_64/source-based/libcap.so.lsdump
index 2bac82d4..0afd1e22 100644
--- a/34/64/x86_64/source-based/libcap.so.lsdump
+++ b/34/64/x86_64/source-based/libcap.so.lsdump
@@ -59,6 +59,9 @@
  "elf_functions" :
  [
   {
+   "name" : "_libcap_strdup"
+  },
+  {
    "name" : "cap_clear"
   },
   {
@@ -86,9 +89,6 @@
    "name" : "cap_fill"
   },
   {
-   "name" : "cap_fill_flag"
-  },
-  {
    "name" : "cap_free"
   },
   {
@@ -131,21 +131,12 @@
    "name" : "cap_get_secbits"
   },
   {
-   "name" : "cap_iab_compare"
-  },
-  {
-   "name" : "cap_iab_dup"
-  },
-  {
    "name" : "cap_iab_fill"
   },
   {
    "name" : "cap_iab_from_text"
   },
   {
-   "name" : "cap_iab_get_pid"
-  },
-  {
    "name" : "cap_iab_get_proc"
   },
   {
@@ -203,9 +194,6 @@
    "name" : "cap_prctlw"
   },
   {
-   "name" : "cap_proc_root"
-  },
-  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -543,27 +531,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_fill_flag",
-   "linker_set_key" : "cap_fill_flag",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    },
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_free",
    "linker_set_key" : "cap_free",
    "parameters" :
@@ -726,33 +693,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_compare",
-   "linker_set_key" : "cap_iab_compare",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    },
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
-   "function_name" : "cap_iab_dup",
-   "linker_set_key" : "cap_iab_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_fill",
    "linker_set_key" : "cap_iab_fill",
    "parameters" :
@@ -786,18 +726,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_get_pid",
-   "linker_set_key" : "cap_iab_get_pid",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_get_proc",
    "linker_set_key" : "cap_iab_get_proc",
    "return_type" : "_ZTIP9cap_iab_s",
@@ -905,7 +833,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -920,7 +848,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -950,7 +878,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -971,7 +899,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -986,7 +914,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1080,18 +1008,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_proc_root",
-   "linker_set_key" : "cap_proc_root",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPc",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_reset_ambient",
    "linker_set_key" : "cap_reset_ambient",
    "return_type" : "_ZTIi",
diff --git a/34/64/x86_64/source-based/libcodec2.so.lsdump b/34/64/x86_64/source-based/libcodec2.so.lsdump
index 99ccf32a..b15d8055 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1268,7 +1268,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/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" : 18446744073709551600,
+     "enum_field_value" : -16,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3618,7 +3618,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3976,7 +3976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4280,11 +4280,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -6756,7 +6756,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -6765,7 +6765,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -6945,7 +6945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7017,7 +7017,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7224,7 +7224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7233,7 +7233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7242,7 +7242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7251,7 +7251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7260,7 +7260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7269,7 +7269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7278,7 +7278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7449,7 +7449,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7494,7 +7494,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7782,7 +7782,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7791,7 +7791,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7800,7 +7800,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -8165,7 +8165,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -8225,7 +8225,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8275,7 +8275,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -9020,7 +9020,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -9076,7 +9076,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -9560,7 +9560,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -10028,7 +10028,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10620,7 +10620,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10987,7 +10987,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/x86_64/source-based/libcrypto.so.lsdump b/34/64/x86_64/source-based/libcrypto.so.lsdump
index cc53b91c..3f58701f 100644
--- a/34/64/x86_64/source-based/libcrypto.so.lsdump
+++ b/34/64/x86_64/source-based/libcrypto.so.lsdump
@@ -38,6 +38,15 @@
    "source_file" : "external/boringssl/src/include/openssl/cipher.h"
   },
   {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA16_m",
+   "name" : "unsigned long[16]",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIA16_m",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1808_h",
    "name" : "unsigned char[1808]",
@@ -120,11 +129,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -593,9 +602,6 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
-   "name" : "ASN1_TIME_set_string_X509"
-  },
-  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1847,6 +1853,18 @@
    "name" : "CRYPTO_MUTEX_unlock_write"
   },
   {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_write"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_write"
+  },
+  {
    "name" : "CRYPTO_THREADID_current"
   },
   {
@@ -2588,18 +2606,6 @@
    "name" : "EC_get_builtin_curves"
   },
   {
-   "name" : "EC_group_p224"
-  },
-  {
-   "name" : "EC_group_p256"
-  },
-  {
-   "name" : "EC_group_p384"
-  },
-  {
-   "name" : "EC_group_p521"
-  },
-  {
    "name" : "EC_hash_to_curve_p256_xmd_sha256_sswu"
   },
   {
@@ -3056,15 +3062,6 @@
    "name" : "EVP_HPKE_CTX_seal"
   },
   {
-   "name" : "EVP_HPKE_CTX_setup_auth_recipient"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing"
-  },
-  {
    "name" : "EVP_HPKE_CTX_setup_recipient"
   },
   {
@@ -3500,9 +3497,6 @@
    "name" : "EVP_aead_aes_128_cbc_sha1_tls_implicit_iv"
   },
   {
-   "name" : "EVP_aead_aes_128_cbc_sha256_tls"
-  },
-  {
    "name" : "EVP_aead_aes_128_ccm_bluetooth"
   },
   {
@@ -3722,9 +3716,6 @@
    "name" : "EVP_sha256"
   },
   {
-   "name" : "EVP_sha256_final_with_secret_suffix"
-  },
-  {
    "name" : "EVP_sha384"
   },
   {
@@ -4169,69 +4160,6 @@
    "name" : "OPENSSL_secure_malloc"
   },
   {
-   "name" : "OPENSSL_sk_deep_copy"
-  },
-  {
-   "name" : "OPENSSL_sk_delete"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_if"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_ptr"
-  },
-  {
-   "name" : "OPENSSL_sk_dup"
-  },
-  {
-   "name" : "OPENSSL_sk_find"
-  },
-  {
-   "name" : "OPENSSL_sk_free"
-  },
-  {
-   "name" : "OPENSSL_sk_insert"
-  },
-  {
-   "name" : "OPENSSL_sk_is_sorted"
-  },
-  {
-   "name" : "OPENSSL_sk_new"
-  },
-  {
-   "name" : "OPENSSL_sk_new_null"
-  },
-  {
-   "name" : "OPENSSL_sk_num"
-  },
-  {
-   "name" : "OPENSSL_sk_pop"
-  },
-  {
-   "name" : "OPENSSL_sk_pop_free_ex"
-  },
-  {
-   "name" : "OPENSSL_sk_push"
-  },
-  {
-   "name" : "OPENSSL_sk_set"
-  },
-  {
-   "name" : "OPENSSL_sk_set_cmp_func"
-  },
-  {
-   "name" : "OPENSSL_sk_shift"
-  },
-  {
-   "name" : "OPENSSL_sk_sort"
-  },
-  {
-   "name" : "OPENSSL_sk_value"
-  },
-  {
-   "name" : "OPENSSL_sk_zero"
-  },
-  {
    "name" : "OPENSSL_strcasecmp"
   },
   {
@@ -4838,27 +4766,6 @@
    "name" : "RSA_new_method"
   },
   {
-   "name" : "RSA_new_method_no_e"
-  },
-  {
-   "name" : "RSA_new_private_key"
-  },
-  {
-   "name" : "RSA_new_private_key_large_e"
-  },
-  {
-   "name" : "RSA_new_private_key_no_crt"
-  },
-  {
-   "name" : "RSA_new_private_key_no_e"
-  },
-  {
-   "name" : "RSA_new_public_key"
-  },
-  {
-   "name" : "RSA_new_public_key_large_e"
-  },
-  {
    "name" : "RSA_padding_add_PKCS1_OAEP_mgf1"
   },
   {
@@ -7448,9 +7355,36 @@
    "name" : "s2i_ASN1_OCTET_STRING"
   },
   {
+   "name" : "sk_deep_copy"
+  },
+  {
+   "name" : "sk_delete"
+  },
+  {
+   "name" : "sk_delete_if"
+  },
+  {
+   "name" : "sk_delete_ptr"
+  },
+  {
+   "name" : "sk_dup"
+  },
+  {
+   "name" : "sk_find"
+  },
+  {
    "name" : "sk_free"
   },
   {
+   "name" : "sk_insert"
+  },
+  {
+   "name" : "sk_is_sorted"
+  },
+  {
+   "name" : "sk_new"
+  },
+  {
    "name" : "sk_new_null"
   },
   {
@@ -7469,9 +7403,24 @@
    "name" : "sk_push"
   },
   {
+   "name" : "sk_set"
+  },
+  {
+   "name" : "sk_set_cmp_func"
+  },
+  {
+   "name" : "sk_shift"
+  },
+  {
+   "name" : "sk_sort"
+  },
+  {
    "name" : "sk_value"
   },
   {
+   "name" : "sk_zero"
+  },
+  {
    "name" : "v2i_GENERAL_NAME"
   },
   {
@@ -8536,23 +8485,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8916,30 +8865,6 @@
      "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
     },
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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"
     },
     {
@@ -10440,21 +10365,6 @@
    "source_file" : "external/boringssl/src/include/openssl/asn1.h"
   },
   {
-   "function_name" : "ASN1_TIME_set_string_X509",
-   "linker_set_key" : "ASN1_TIME_set_string_X509",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
    "function_name" : "ASN1_TIME_to_generalizedtime",
    "linker_set_key" : "ASN1_TIME_to_generalizedtime",
    "parameters" :
@@ -16332,21 +16242,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
-   "function_name" : "EC_get_builtin_curves",
-   "linker_set_key" : "EC_get_builtin_curves",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP16EC_builtin_curve"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
    "function_name" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "linker_set_key" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "parameters" :
@@ -17406,135 +17301,6 @@
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
    "function_name" : "EVP_HPKE_CTX_setup_recipient",
    "linker_set_key" : "EVP_HPKE_CTX_setup_recipient",
    "parameters" :
@@ -19419,12 +19185,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "linker_set_key" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -20949,318 +20709,6 @@
    "source_file" : "external/boringssl/src/include/openssl/mem.h"
   },
   {
-   "function_name" : "OPENSSL_sk_deep_copy",
-   "linker_set_key" : "OPENSSL_sk_deep_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPKvE"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete",
-   "linker_set_key" : "OPENSSL_sk_delete",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_if",
-   "linker_set_key" : "OPENSSL_sk_delete_if",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPvS_E"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_ptr",
-   "linker_set_key" : "OPENSSL_sk_delete_ptr",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_dup",
-   "linker_set_key" : "OPENSSL_sk_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_find",
-   "linker_set_key" : "OPENSSL_sk_find",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_free",
-   "linker_set_key" : "OPENSSL_sk_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_insert",
-   "linker_set_key" : "OPENSSL_sk_insert",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_is_sorted",
-   "linker_set_key" : "OPENSSL_sk_is_sorted",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new",
-   "linker_set_key" : "OPENSSL_sk_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new_null",
-   "linker_set_key" : "OPENSSL_sk_new_null",
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_num",
-   "linker_set_key" : "OPENSSL_sk_num",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop",
-   "linker_set_key" : "OPENSSL_sk_pop",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop_free_ex",
-   "linker_set_key" : "OPENSSL_sk_pop_free_ex",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_push",
-   "linker_set_key" : "OPENSSL_sk_push",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set",
-   "linker_set_key" : "OPENSSL_sk_set",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set_cmp_func",
-   "linker_set_key" : "OPENSSL_sk_set_cmp_func",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIPFiPKPKvS2_E",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_shift",
-   "linker_set_key" : "OPENSSL_sk_shift",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_sort",
-   "linker_set_key" : "OPENSSL_sk_sort",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_value",
-   "linker_set_key" : "OPENSSL_sk_value",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_zero",
-   "linker_set_key" : "OPENSSL_sk_zero",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
    "function_name" : "OPENSSL_strcasecmp",
    "linker_set_key" : "OPENSSL_strcasecmp",
    "parameters" :
@@ -27776,10 +27224,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27848,7 +27296,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29864,7 +29312,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30653,7 +30101,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31898,7 +31346,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31919,7 +31367,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -36273,6 +35721,114 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
+   "function_name" : "sk_deep_copy",
+   "linker_set_key" : "sk_deep_copy",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPKvE"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPFvPvES_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPvE"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete",
+   "linker_set_key" : "sk_delete",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_if",
+   "linker_set_key" : "sk_delete_if",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPvS_E"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_ptr",
+   "linker_set_key" : "sk_delete_ptr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_dup",
+   "linker_set_key" : "sk_dup",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_find",
+   "linker_set_key" : "sk_find",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPm"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_free",
    "linker_set_key" : "sk_free",
    "parameters" :
@@ -36285,6 +35841,48 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_insert",
+   "linker_set_key" : "sk_insert",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_is_sorted",
+   "linker_set_key" : "sk_is_sorted",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_new",
+   "linker_set_key" : "sk_new",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_new_null",
    "linker_set_key" : "sk_new_null",
    "return_type" : "_ZTIP8stack_st",
@@ -36363,6 +35961,66 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_set",
+   "linker_set_key" : "sk_set",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_set_cmp_func",
+   "linker_set_key" : "sk_set_cmp_func",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIPFiPKPKvS2_E",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_shift",
+   "linker_set_key" : "sk_shift",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_sort",
+   "linker_set_key" : "sk_sort",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_value",
    "linker_set_key" : "sk_value",
    "parameters" :
@@ -36378,6 +36036,18 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_zero",
+   "linker_set_key" : "sk_zero",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "v2i_GENERAL_NAME",
    "linker_set_key" : "v2i_GENERAL_NAME",
    "parameters" :
@@ -37217,6 +36887,24 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
+   "name" : "bn_mont_ctx_st *",
+   "referenced_type" : "_ZTI14bn_mont_ctx_st",
+   "self_type" : "_ZTIP14bn_mont_ctx_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIP14private_key_st",
    "name" : "private_key_st *",
    "referenced_type" : "_ZTI14private_key_st",
@@ -37334,15 +37022,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP16EC_builtin_curve",
-   "name" : "EC_builtin_curve *",
-   "referenced_type" : "_ZTI16EC_builtin_curve",
-   "self_type" : "_ZTIP16EC_builtin_curve",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP16HRSS_private_key",
    "name" : "HRSS_private_key *",
    "referenced_type" : "_ZTI16HRSS_private_key",
@@ -38234,10 +37913,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *, const void *)",
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "self_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
+   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38389,15 +38068,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
    "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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,
@@ -38668,15 +38338,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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,
@@ -39458,15 +39119,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKl",
-   "name" : "const long *",
-   "referenced_type" : "_ZTIKl",
-   "self_type" : "_ZTIPKl",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKm",
    "name" : "const unsigned long *",
    "referenced_type" : "_ZTIKm",
@@ -39481,7 +39133,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -39674,6 +39326,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPP14trust_token_st",
    "name" : "trust_token_st **",
    "referenced_type" : "_ZTIP14trust_token_st",
@@ -40075,7 +39736,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -40147,7 +39808,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/bio.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   }
  ],
  "qualified_types" :
@@ -40209,7 +39870,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 544,
+   "size" : 392,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40531,7 +40192,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40551,7 +40212,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 88,
+   "size" : 72,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40951,15 +40612,17 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 128,
+   "size" : 144,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 240,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -41083,16 +40746,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKl",
-   "name" : "const long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIKl",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKm",
    "name" : "const unsigned long",
    "referenced_type" : "_ZTIm",
@@ -41106,7 +40759,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   }
  ],
  "record_types" :
@@ -41349,42 +41002,6 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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"
     },
     {
@@ -42534,7 +42151,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42542,7 +42159,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42570,22 +42187,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5056,
+     "field_offset" : 5184,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5632,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42593,7 +42210,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42886,7 +42503,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIA128_h"
+     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
     },
     {
      "field_name" : "block_used",
@@ -43416,7 +43033,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -43428,7 +43045,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43617,6 +43234,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 416,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 448,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 672,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 1152,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 1216,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 1280,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 1344,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 1408,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 1472,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 1600,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 1664,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 1728,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1792,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1856,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 240,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 40,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPm"
     },
@@ -43897,6 +43757,28 @@
    "source_file" : "external/boringssl/src/include/openssl/kyber.h"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "bytes",
+     "referenced_type" : "_ZTIA128_h"
+    },
+    {
+     "field_name" : "words",
+     "referenced_type" : "_ZTIA16_m"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN16blake2b_state_stUt_E",
+   "name" : "blake2b_state_st::(unnamed)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN16blake2b_state_stUt_E",
+   "self_type" : "_ZTIN16blake2b_state_stUt_E",
+   "size" : 128,
+   "source_file" : "external/boringssl/src/include/openssl/blake2.h"
+  },
+  {
    "alignment" : 2,
    "fields" :
    [
diff --git a/34/64/x86_64/source-based/libcrypto_utils.so.lsdump b/34/64/x86_64/source-based/libcrypto_utils.so.lsdump
index 4f48f008..305a6ec1 100644
--- a/34/64/x86_64/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/x86_64/source-based/libcrypto_utils.so.lsdump
@@ -137,11 +137,13 @@
  "qualified_types" :
  [
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 240,
    "source_file" : "system/core/libcrypto_utils/include/crypto_utils/android_pubkey.h"
   },
   {
diff --git a/34/64/x86_64/source-based/libcurl.so.lsdump b/34/64/x86_64/source-based/libcurl.so.lsdump
index aa62a65c..5cd6e74d 100644
--- a/34/64/x86_64/source-based/libcurl.so.lsdump
+++ b/34/64/x86_64/source-based/libcurl.so.lsdump
@@ -112,6 +112,12 @@
    "name" : "Curl_all_content_encodings"
   },
   {
+   "name" : "Curl_alpn_get_proxy_spec"
+  },
+  {
+   "name" : "Curl_alpn_get_spec"
+  },
+  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -202,81 +208,9 @@
    "name" : "Curl_base64url_encode"
   },
   {
-   "name" : "Curl_bufcp_free"
-  },
-  {
-   "name" : "Curl_bufcp_init"
-  },
-  {
-   "name" : "Curl_bufcp_put"
-  },
-  {
-   "name" : "Curl_bufcp_take"
-  },
-  {
    "name" : "Curl_buffer_send"
   },
   {
-   "name" : "Curl_bufq_free"
-  },
-  {
-   "name" : "Curl_bufq_init"
-  },
-  {
-   "name" : "Curl_bufq_init2"
-  },
-  {
-   "name" : "Curl_bufq_initp"
-  },
-  {
-   "name" : "Curl_bufq_is_empty"
-  },
-  {
-   "name" : "Curl_bufq_is_full"
-  },
-  {
-   "name" : "Curl_bufq_len"
-  },
-  {
-   "name" : "Curl_bufq_pass"
-  },
-  {
-   "name" : "Curl_bufq_peek"
-  },
-  {
-   "name" : "Curl_bufq_peek_at"
-  },
-  {
-   "name" : "Curl_bufq_read"
-  },
-  {
-   "name" : "Curl_bufq_reset"
-  },
-  {
-   "name" : "Curl_bufq_sipn"
-  },
-  {
-   "name" : "Curl_bufq_skip"
-  },
-  {
-   "name" : "Curl_bufq_skip_and_shift"
-  },
-  {
-   "name" : "Curl_bufq_slurp"
-  },
-  {
-   "name" : "Curl_bufq_slurpn"
-  },
-  {
-   "name" : "Curl_bufq_space"
-  },
-  {
-   "name" : "Curl_bufq_write"
-  },
-  {
-   "name" : "Curl_bufq_write_pass"
-  },
-  {
    "name" : "Curl_bufref_free"
   },
   {
@@ -346,9 +280,6 @@
    "name" : "Curl_cf_def_send"
   },
   {
-   "name" : "Curl_cf_h1_proxy_insert_after"
-  },
-  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -361,9 +292,6 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
-   "name" : "Curl_cf_http_proxy_get_host"
-  },
-  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -439,13 +367,13 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard_all"
+   "name" : "Curl_conn_cf_discard"
   },
   {
-   "name" : "Curl_conn_cf_discard_chain"
+   "name" : "Curl_conn_cf_discard_all"
   },
   {
-   "name" : "Curl_conn_cf_discard_sub"
+   "name" : "Curl_conn_cf_discard_chain"
   },
   {
    "name" : "Curl_conn_cf_get_select_socks"
@@ -457,9 +385,6 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
-   "name" : "Curl_conn_cf_is_ssl"
-  },
-  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -514,6 +439,9 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
+   "name" : "Curl_conn_http_proxy_add"
+  },
+  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -682,72 +610,6 @@
    "name" : "Curl_dyn_vprintf"
   },
   {
-   "name" : "Curl_dynhds_add"
-  },
-  {
-   "name" : "Curl_dynhds_add_custom"
-  },
-  {
-   "name" : "Curl_dynhds_cadd"
-  },
-  {
-   "name" : "Curl_dynhds_ccontains"
-  },
-  {
-   "name" : "Curl_dynhds_ccount_name"
-  },
-  {
-   "name" : "Curl_dynhds_cget"
-  },
-  {
-   "name" : "Curl_dynhds_contains"
-  },
-  {
-   "name" : "Curl_dynhds_count"
-  },
-  {
-   "name" : "Curl_dynhds_count_name"
-  },
-  {
-   "name" : "Curl_dynhds_cremove"
-  },
-  {
-   "name" : "Curl_dynhds_cset"
-  },
-  {
-   "name" : "Curl_dynhds_free"
-  },
-  {
-   "name" : "Curl_dynhds_get"
-  },
-  {
-   "name" : "Curl_dynhds_getn"
-  },
-  {
-   "name" : "Curl_dynhds_h1_add_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_cadd_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_dprint"
-  },
-  {
-   "name" : "Curl_dynhds_init"
-  },
-  {
-   "name" : "Curl_dynhds_remove"
-  },
-  {
-   "name" : "Curl_dynhds_reset"
-  },
-  {
-   "name" : "Curl_dynhds_set"
-  },
-  {
-   "name" : "Curl_dynhds_set_opts"
-  },
-  {
    "name" : "Curl_expire"
   },
   {
@@ -820,15 +682,6 @@
    "name" : "Curl_gmtime"
   },
   {
-   "name" : "Curl_h1_req_parse_free"
-  },
-  {
-   "name" : "Curl_h1_req_parse_init"
-  },
-  {
-   "name" : "Curl_h1_req_parse_read"
-  },
-  {
    "name" : "Curl_hash_add"
   },
   {
@@ -931,9 +784,6 @@
    "name" : "Curl_http_cookies"
   },
   {
-   "name" : "Curl_http_decode_status"
-  },
-  {
    "name" : "Curl_http_done"
   },
   {
@@ -961,24 +811,6 @@
    "name" : "Curl_http_readwrite_headers"
   },
   {
-   "name" : "Curl_http_req_free"
-  },
-  {
-   "name" : "Curl_http_req_make"
-  },
-  {
-   "name" : "Curl_http_req_make2"
-  },
-  {
-   "name" : "Curl_http_req_to_h2"
-  },
-  {
-   "name" : "Curl_http_resp_free"
-  },
-  {
-   "name" : "Curl_http_resp_make"
-  },
-  {
    "name" : "Curl_http_resume"
   },
   {
@@ -1654,9 +1486,6 @@
    "name" : "Curl_updatesocket"
   },
   {
-   "name" : "Curl_url_set_authority"
-  },
-  {
    "name" : "Curl_urldecode"
   },
   {
@@ -2020,9 +1849,6 @@
    "name" : "Curl_cfree"
   },
   {
-   "name" : "Curl_cft_h1_proxy"
-  },
-  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4430,10 +4256,6 @@
      "name" : "CURLPROXY_HTTPS"
     },
     {
-     "enum_field_value" : 3,
-     "name" : "CURLPROXY_HTTPS2"
-    },
-    {
      "enum_field_value" : 4,
      "name" : "CURLPROXY_SOCKS4"
     },
diff --git a/34/64/x86_64/source-based/libdiskconfig.so.lsdump b/34/64/x86_64/source-based/libdiskconfig.so.lsdump
new file mode 100644
index 00000000..db7901ff
--- /dev/null
+++ b/34/64/x86_64/source-based/libdiskconfig.so.lsdump
@@ -0,0 +1,641 @@
+{
+ "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 6313e848..ad5c5795 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" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1604,7 +1604,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "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 d8f85879..182b3994 100644
--- a/34/64/x86_64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/x86_64/source-based/libdumpstateutil.so.lsdump
@@ -152,9 +152,6 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -204,9 +201,6 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -579,12 +573,6 @@
    "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
   },
   {
-   "function_name" : "android::os::dumpstate::PropertiesHelper::IsStrictRun",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv",
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
    "function_name" : "android::os::dumpstate::PropertiesHelper::IsUserBuild",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv",
    "return_type" : "_ZTIb",
@@ -723,13 +711,6 @@
   },
   {
    "access" : "private",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E",
-   "name" : "android::os::dumpstate::PropertiesHelper::strict_run_",
-   "referenced_type" : "_ZTIi",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
-   "access" : "private",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E",
    "name" : "android::os::dumpstate::PropertiesHelper::parallel_run_",
    "referenced_type" : "_ZTIi",
diff --git a/34/64/x86_64/source-based/libgralloctypes.so.lsdump b/34/64/x86_64/source-based/libgralloctypes.so.lsdump
index ac363015..cb9aebfe 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3451,11 +3451,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4036,11 +4036,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/libhardware.so.lsdump b/34/64/x86_64/source-based/libhardware.so.lsdump
index f7204c07..74777c59 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -945,7 +945,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -984,7 +984,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -1002,7 +1002,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1079,7 +1079,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1088,7 +1088,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1097,7 +1097,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1128,7 +1128,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1138,7 +1138,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1177,7 +1177,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1233,7 +1233,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1424,7 +1424,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_64/source-based/libhidlbase.so.lsdump b/34/64/x86_64/source-based/libhidlbase.so.lsdump
index cfe85181..65012315 100644
--- a/34/64/x86_64/source-based/libhidlbase.so.lsdump
+++ b/34/64/x86_64/source-based/libhidlbase.so.lsdump
@@ -263,6 +263,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -275,6 +283,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -287,6 +299,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -295,11 +311,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
@@ -2349,6 +2365,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
   },
   {
@@ -2752,6 +2788,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE18__lookup_classnameIPKcEEtT_S5_bc"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__112regex_traitsIcE19__transform_primaryINS_11__wrap_iterIPcEEEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SC_c"
   },
   {
@@ -2768,6 +2808,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2832,15 +2876,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE13__lower_boundIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEERKT_SU_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEE"
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEERKT_"
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_21__tree_const_iteratorISH_PNS_11__tree_nodeISH_SE_EElEERKT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE4findIS7_EENS_21__tree_const_iteratorISH_PNS_11__tree_nodeISH_SE_EElEERKT_"
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
   },
   {
    "binding" : "weak",
@@ -2852,15 +2896,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEmmPNS_16__owns_one_stateIcEEmmb"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEmmPNS_16__owns_one_stateIcEEmmb"
   },
   {
    "binding" : "weak",
@@ -2876,10 +2924,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__parse_BACKREFIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__push_back_refEi"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ORD_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ecma_expIPKcEET_S7_S7_"
   },
   {
@@ -2896,6 +2952,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_simple_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_ERE_branchIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_awk_escapeIPKcEET_S7_S7_PNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -2908,6 +2972,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE19__parse_QUOTED_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE19__parse_atom_escapeIPKcEET_S7_S7_"
   },
   {
@@ -2928,6 +2996,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2972,10 +3044,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE25__parse_pattern_characterIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE26__parse_bracket_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2992,6 +3060,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__parse_one_char_or_coll_elem_EREIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__push_begin_marked_subexpressionEv"
   },
   {
@@ -3000,10 +3072,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE3endEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE5clearEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEE3endEv"
   },
   {
@@ -3012,6 +3096,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112regex_traitsIcE6__initEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -3020,6 +3112,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3028,10 +3124,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS_6vectorIPKcNS_9allocatorISA_EEEEEENSB_ISE_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairImPKcEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
   },
   {
@@ -3044,10 +3152,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE11__read_modeEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE12__write_modeEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE4openEPKcj"
   },
   {
@@ -3100,7 +3224,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
+   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
   },
   {
    "binding" : "weak",
@@ -3120,6 +3244,42 @@
   },
   {
    "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_"
   },
   {
@@ -3132,6 +3292,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3140,6 +3304,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3148,11 +3316,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
@@ -3160,6 +3328,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -3256,18 +3428,70 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISN_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE14__erase_uniqueIS8_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_10unique_ptrINS_11__tree_nodeISB_PvEENS_22__tree_node_destructorINSG_ISV_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEElEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE4findIS8_EENS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE5eraseENS_21__tree_const_iteratorISB_PNS_11__tree_nodeISB_PvEElEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS9_PvEENS_22__tree_node_destructorINSE_IST_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE5eraseENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSP_SP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE25__emplace_unique_key_argsIS7_JS7_SD_EEENS_4pairINS_15__tree_iteratorISE_PNS_11__tree_nodeISE_PvEElEEbEERKT_DpOT0_"
   },
   {
@@ -3284,6 +3508,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEElEEbEERKT_DpOT0_"
   },
   {
@@ -3296,6 +3524,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE14__erase_uniqueIS7_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EElEEbEERKT_DpOT0_"
   },
   {
@@ -3312,6 +3548,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE14__erase_uniqueIS7_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISE_EEEERSR_SR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EElEEbEERKT_DpOT0_"
   },
   {
@@ -3332,19 +3576,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE5eraseENS_21__tree_const_iteratorISD_PNS_11__tree_nodeISD_PvEElEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEElEEbEERKT_DpOT0_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEElEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
@@ -3360,6 +3604,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3372,6 +3620,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS0_IPKcNS_9allocatorIS9_EEEEEENSA_ISD_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -3380,10 +3632,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIccEENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE6assignIPS4_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS4_NS_15iterator_traitsISB_E9referenceEEE5valueEvE4typeESB_SB_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairImPKcEENS_9allocatorIS4_EEE8__appendEm"
   },
   {
@@ -3396,10 +3668,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE6resizeEm"
   },
   {
@@ -3416,6 +3696,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE6assignEmRKS4_"
   },
   {
@@ -3424,6 +3708,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE6resizeEmRKS4_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEmRKS4_"
   },
   {
@@ -3432,10 +3720,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE21__push_back_slow_pathIS1_EEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE21__push_back_slow_pathIRKcEEvOT_"
   },
   {
@@ -3444,6 +3744,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2INS_21__tree_const_iteratorIiPNS_11__tree_nodeIiPvEElEEEET_NS_9enable_ifIXaasr21__is_forward_iteratorISB_EE5valuesr16is_constructibleIiNS_15iterator_traitsISB_E9referenceEEE5valueESB_E4typeE"
   },
   {
@@ -3452,6 +3760,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3460,6 +3772,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__1plIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_12basic_stringIT_T0_T1_EERKS9_SB_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__1rsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_istreamIT_T0_EES9_RNS_12basic_stringIS6_S7_T1_EE"
   },
   {
@@ -3736,6 +4052,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -3767,6 +4087,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -3852,6 +4176,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -3999,6 +4327,10 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
+  },
+  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4008,6 +4340,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4017,6 +4353,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4043,6 +4383,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8427,6 +8771,42 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::base::V1_0::IBase>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl4base4V1_05IBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl4base4V1_05IBaseEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_215IServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_",
    "parameters" :
@@ -8475,6 +8855,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_",
    "parameters" :
@@ -8524,6 +8920,22 @@
   },
   {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE",
    "parameters" :
    [
@@ -8556,35 +8968,35 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "function_name" : "android::sp<android::hardware::hidl_binder_death_recipient>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     },
     {
-     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
     },
     {
-     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -19022,6 +19434,91 @@
   },
   {
    "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
    "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
    "parameters" :
    [
@@ -21391,8 +21888,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/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",
+   "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",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -22742,7 +23239,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/e560d7b19ebf7276b3e850d3d346dec8/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/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 40669401..50e90cc8 100644
--- a/34/64/x86_64/source-based/libmedia_helper.so.lsdump
+++ b/34/64/x86_64/source-based/libmedia_helper.so.lsdump
@@ -667,33 +667,21 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10valueHacOnE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
-   "name" : "_ZN7android14AudioParameter11valueHacOffE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
-   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -715,15 +703,6 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -733,9 +712,6 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
-   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1449,24 +1425,12 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10keyTtyModeE",
-   "name" : "android::AudioParameter::keyTtyMode",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter10valueFalseE",
    "name" : "android::AudioParameter::valueFalse",
    "referenced_type" : "_ZTIKPKc",
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10valueHacOnE",
-   "name" : "android::AudioParameter::valueHacOn",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter11keyChannelsE",
    "name" : "android::AudioParameter::keyChannels",
    "referenced_type" : "_ZTIKPKc",
@@ -1479,12 +1443,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter11valueHacOffE",
-   "name" : "android::AudioParameter::valueHacOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter12keyProgramIdE",
    "name" : "android::AudioParameter::keyProgramId",
    "referenced_type" : "_ZTIKPKc",
@@ -1497,12 +1455,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter13keyHacSettingE",
-   "name" : "android::AudioParameter::keyHacSetting",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter13keyMonoOutputE",
    "name" : "android::AudioParameter::keyMonoOutput",
    "referenced_type" : "_ZTIKPKc",
@@ -1545,24 +1497,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeHcoE",
-   "name" : "android::AudioParameter::valueTtyModeHco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeOffE",
-   "name" : "android::AudioParameter::valueTtyModeOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeVcoE",
-   "name" : "android::AudioParameter::valueTtyModeVco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter16keyBtLeSuspendedE",
    "name" : "android::AudioParameter::keyBtLeSuspended",
    "referenced_type" : "_ZTIKPKc",
@@ -1581,12 +1515,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter16valueTtyModeFullE",
-   "name" : "android::AudioParameter::valueTtyModeFull",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter17keyPresentationIdE",
    "name" : "android::AudioParameter::keyPresentationId",
    "referenced_type" : "_ZTIKPKc",
diff --git a/34/64/x86_64/source-based/libmedia_omx.so.lsdump b/34/64/x86_64/source-based/libmedia_omx.so.lsdump
index 5ea79b53..44739032 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5548,7 +5548,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5920,7 +5920,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10605,11 +10605,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11196,11 +11196,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11781,11 +11781,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12744,7 +12744,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12762,7 +12762,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12795,7 +12795,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12810,7 +12810,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12828,7 +12828,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12846,7 +12846,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12873,7 +12873,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17046,7 +17046,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17073,7 +17073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17100,7 +17100,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17118,7 +17118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17235,7 +17235,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17244,7 +17244,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17253,7 +17253,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17262,7 +17262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17271,7 +17271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17280,7 +17280,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17289,7 +17289,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -18886,15 +18886,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "_ZTIN7android12LightRefBaseINS_5FenceEEE",
-   "self_type" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android12NativeHandleE",
    "name" : "android::NativeHandle *",
    "referenced_type" : "_ZTIN7android12NativeHandleE",
@@ -19003,15 +18994,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "_ZTIN7android19FenceToFenceTimeMapE",
-   "self_type" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "size" : 8,
-   "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -20358,7 +20340,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -20385,7 +20367,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -20574,7 +20556,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20604,7 +20586,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22379,13 +22361,11 @@
    "source_file" : "frameworks/av/media/libmedia/include/media/MediaCodecBuffer.h"
   },
   {
-   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
    "name" : "const std::shared_ptr<android::FenceTime>",
    "referenced_type" : "_ZTINSt3__110shared_ptrIN7android9FenceTimeEEE",
    "self_type" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
-   "size" : 16,
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -23203,7 +23183,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23259,7 +23239,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23444,7 +23424,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23588,7 +23568,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23881,7 +23861,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24263,7 +24243,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -35382,12 +35362,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -43498,15 +43472,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTION7android2spINS_7ALooperEEE",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ALooperEEE",
diff --git a/34/64/x86_64/source-based/libprocessgroup.so.lsdump b/34/64/x86_64/source-based/libprocessgroup.so.lsdump
index 38f19efc..bca720df 100644
--- a/34/64/x86_64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/x86_64/source-based/libprocessgroup.so.lsdump
@@ -145,9 +145,6 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
-   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
-  },
-  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -249,7 +246,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1137,15 +1134,9 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1161,15 +1152,9 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1182,18 +1167,12 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1221,42 +1200,21 @@
    "name" : "_ZNK16ProfileAttribute14GetPathForTaskEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZNK16ProfileAttribute17GetPathForProcessEjiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
-   "name" : "_ZNK16ProfileAttribute9file_nameEv"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction13ExecuteForUIDEj"
   },
   {
    "name" : "_ZNK18SetAttributeAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18SetAttributeAction14IsValidForTaskEi"
-  },
-  {
-   "name" : "_ZNK18SetAttributeAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18SetAttributeAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK19SetTimerSlackAction14ExecuteForTaskEi"
   },
   {
diff --git a/34/64/x86_64/source-based/libsqlite.so.lsdump b/34/64/x86_64/source-based/libsqlite.so.lsdump
index 4282a1df..4e718747 100644
--- a/34/64/x86_64/source-based/libsqlite.so.lsdump
+++ b/34/64/x86_64/source-based/libsqlite.so.lsdump
@@ -337,9 +337,6 @@
    "name" : "sqlite3_interrupt"
   },
   {
-   "name" : "sqlite3_is_interrupted"
-  },
-  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -694,9 +691,6 @@
    "name" : "sqlite3_value_dup"
   },
   {
-   "name" : "sqlite3_value_encoding"
-  },
-  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/x86_64/source-based/libssl.so.lsdump b/34/64/x86_64/source-based/libssl.so.lsdump
index 5f76fe41..b1645cdf 100644
--- a/34/64/x86_64/source-based/libssl.so.lsdump
+++ b/34/64/x86_64/source-based/libssl.so.lsdump
@@ -20,15 +20,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA13_22SignatureAlgorithmName",
-   "name" : "SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1424_h",
    "name" : "unsigned char[1424]",
@@ -74,15 +65,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA24_13ssl_cipher_st",
-   "name" : "ssl_cipher_st[24]",
-   "referenced_type" : "_ZTI13ssl_cipher_st",
-   "self_type" : "_ZTIA24_13ssl_cipher_st",
-   "size" : 960,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA24_h",
    "name" : "unsigned char[24]",
@@ -137,15 +119,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA3_PKc",
-   "name" : "const char *[3]",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIA3_PKc",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "linker_set_key" : "_ZTIA3_t",
    "name" : "unsigned short[3]",
@@ -192,11 +165,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -227,24 +200,6 @@
    "source_file" : "external/boringssl/src/include/openssl/sha.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl10NamedGroupE",
-   "name" : "bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIN4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA6_N4bssl11VersionInfoE",
-   "name" : "bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "size" : 96,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA7776_h",
    "name" : "unsigned char[7776]",
@@ -574,9 +529,6 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
-   "name" : "SSL_CIPHER_get_handshake_digest"
-  },
-  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -601,6 +553,9 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
+   "name" : "SSL_CIPHER_get_value"
+  },
+  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -865,9 +820,6 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
-   "name" : "SSL_CTX_set1_group_ids"
-  },
-  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1429,24 +1381,6 @@
    "name" : "SSL_get_SSL_CTX"
   },
   {
-   "name" : "SSL_get_all_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_curve_names"
-  },
-  {
-   "name" : "SSL_get_all_group_names"
-  },
-  {
-   "name" : "SSL_get_all_signature_algorithm_names"
-  },
-  {
-   "name" : "SSL_get_all_standard_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_version_names"
-  },
-  {
    "name" : "SSL_get_certificate"
   },
   {
@@ -1507,12 +1441,6 @@
    "name" : "SSL_get_finished"
   },
   {
-   "name" : "SSL_get_group_id"
-  },
-  {
-   "name" : "SSL_get_group_name"
-  },
-  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1534,9 +1462,6 @@
    "name" : "SSL_get_mode"
   },
   {
-   "name" : "SSL_get_negotiated_group"
-  },
-  {
    "name" : "SSL_get_options"
   },
   {
@@ -1807,9 +1732,6 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
-   "name" : "SSL_set1_group_ids"
-  },
-  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2188,9 +2110,6 @@
    "name" : "_ZN4bssl24ssl_cert_check_key_usageEPK6cbs_stNS_15ssl_key_usage_tE"
   },
   {
-   "name" : "_ZN4bssl24ssl_cipher_is_deprecatedEPK13ssl_cipher_st"
-  },
-  {
    "name" : "_ZN4bssl28ssl_is_valid_ech_public_nameENS_4SpanIKhEE"
   },
   {
@@ -6798,18 +6717,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CIPHER_get_handshake_digest",
-   "linker_set_key" : "SSL_CIPHER_get_handshake_digest",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK13ssl_cipher_st"
-    }
-   ],
-   "return_type" : "_ZTIPK9env_md_st",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CIPHER_get_id",
    "linker_set_key" : "SSL_CIPHER_get_id",
    "parameters" :
@@ -6906,6 +6813,18 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CIPHER_get_value",
+   "linker_set_key" : "SSL_CIPHER_get_value",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK13ssl_cipher_st"
+    }
+   ],
+   "return_type" : "_ZTIt",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CIPHER_get_version",
    "linker_set_key" : "SSL_CIPHER_get_version",
    "parameters" :
@@ -8064,24 +7983,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CTX_set1_group_ids",
-   "linker_set_key" : "SSL_CTX_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP10ssl_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CTX_set1_groups",
    "linker_set_key" : "SSL_CTX_set1_groups",
    "parameters" :
@@ -10917,96 +10818,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_all_cipher_names",
-   "linker_set_key" : "SSL_get_all_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_curve_names",
-   "linker_set_key" : "SSL_get_all_curve_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_group_names",
-   "linker_set_key" : "SSL_get_all_group_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_signature_algorithm_names",
-   "linker_set_key" : "SSL_get_all_signature_algorithm_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_standard_cipher_names",
-   "linker_set_key" : "SSL_get_all_standard_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_version_names",
-   "linker_set_key" : "SSL_get_all_version_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_certificate",
    "linker_set_key" : "SSL_get_certificate",
    "parameters" :
@@ -11274,30 +11085,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_group_id",
-   "linker_set_key" : "SSL_get_group_id",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIt",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_group_name",
-   "linker_set_key" : "SSL_get_group_name",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIt"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_info_callback",
    "linker_set_key" : "SSL_get_info_callback",
    "parameters" :
@@ -11391,18 +11178,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_negotiated_group",
-   "linker_set_key" : "SSL_get_negotiated_group",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_options",
    "linker_set_key" : "SSL_get_options",
    "parameters" :
@@ -12660,24 +12435,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_set1_group_ids",
-   "linker_set_key" : "SSL_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP6ssl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_set1_groups",
    "linker_set_key" : "SSL_set1_groups",
    "parameters" :
@@ -14504,15 +14261,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName (&)[13]",
-   "referenced_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "self_type" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA16_Kh",
    "name" : "const unsigned char (&)[16]",
    "referenced_type" : "_ZTIA16_Kh",
@@ -14540,15 +14288,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st (&)[24]",
-   "referenced_type" : "_ZTIA24_K13ssl_cipher_st",
-   "self_type" : "_ZTIRA24_K13ssl_cipher_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA2_Kh",
    "name" : "const unsigned char (&)[2]",
    "referenced_type" : "_ZTIA2_Kh",
@@ -14594,15 +14333,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA3_KPKc",
-   "name" : "const char *const (&)[3]",
-   "referenced_type" : "_ZTIA3_KPKc",
-   "self_type" : "_ZTIRA3_KPKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA3_Kt",
    "name" : "const unsigned short (&)[3]",
    "referenced_type" : "_ZTIA3_Kt",
@@ -14612,15 +14342,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA3_PKc",
-   "name" : "const char *(&)[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIRA3_PKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA4_Kh",
    "name" : "const unsigned char (&)[4]",
    "referenced_type" : "_ZTIA4_Kh",
@@ -14639,24 +14360,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRA8_Kh",
    "name" : "const unsigned char (&)[8]",
    "referenced_type" : "_ZTIA8_Kh",
@@ -14684,24 +14387,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK13ssl_cipher_st",
-   "name" : "const ssl_cipher_st &",
-   "referenced_type" : "_ZTIK13ssl_cipher_st",
-   "self_type" : "_ZTIRK13ssl_cipher_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName &",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIRK22SignatureAlgorithmName",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRK6cbs_st",
    "name" : "const cbs_st &",
    "referenced_type" : "_ZTIK6cbs_st",
@@ -14711,33 +14396,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup &",
-   "referenced_type" : "_ZTIKN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRKN4bssl10NamedGroupE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo &",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRKN4bssl11VersionInfoE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> &",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> &",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -14891,15 +14549,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKPKc",
-   "name" : "const char *const &",
-   "referenced_type" : "_ZTIKPKc",
-   "self_type" : "_ZTIRKPKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKh",
    "name" : "const unsigned char &",
    "referenced_type" : "_ZTIKh",
@@ -14990,15 +14639,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRPKc",
-   "name" : "const char *&",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIRPKc",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRh",
    "name" : "unsigned char &",
    "referenced_type" : "_ZTIh",
@@ -15119,6 +14759,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIP11rsa_meth_st",
+   "name" : "rsa_meth_st *",
+   "referenced_type" : "_ZTI11rsa_meth_st",
+   "self_type" : "_ZTIP11rsa_meth_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIP11ssl_comp_st",
    "name" : "ssl_comp_st *",
    "referenced_type" : "_ZTI11ssl_comp_st",
@@ -15362,6 +15011,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
    "name" : "bn_mont_ctx_st *",
    "referenced_type" : "_ZTI14bn_mont_ctx_st",
@@ -18584,15 +18242,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName *",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIPK22SignatureAlgorithmName",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK22ssl_early_callback_ctx",
    "name" : "const ssl_early_callback_ctx *",
    "referenced_type" : "_ZTIK22ssl_early_callback_ctx",
@@ -18836,15 +18485,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo *",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIPKN4bssl11VersionInfoE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIK13ssl_cipher_stEE",
    "name" : "const bssl::Span<const ssl_cipher_st> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIK13ssl_cipher_stEE",
@@ -18854,15 +18494,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -18872,24 +18503,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKbEE",
@@ -18935,15 +18548,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -19520,15 +19124,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -19538,24 +19133,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKbEE",
    "name" : "bssl::Span<const bool> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -19601,15 +19178,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPN4bssl4SpanIhEE",
    "name" : "bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -19772,6 +19340,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPP14ssl_session_st",
    "name" : "ssl_session_st **",
    "referenced_type" : "_ZTIP14ssl_session_st",
@@ -19804,7 +19381,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 8,
@@ -19840,7 +19417,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 8,
@@ -19919,16 +19496,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA16_Kh",
@@ -19959,16 +19526,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st[24]",
-   "referenced_type" : "_ZTIA24_13ssl_cipher_st",
-   "self_type" : "_ZTIA24_K13ssl_cipher_st",
-   "size" : 960,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA2_Kh",
@@ -20009,16 +19566,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA3_KPKc",
-   "name" : "const char *const[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIA3_KPKc",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "_ZTIA3_Kt",
@@ -20049,26 +19596,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "size" : 96,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA8_Kh",
@@ -20369,7 +19896,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20695,16 +20222,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIK22SignatureAlgorithmName",
-   "size" : 26,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK22ssl_early_callback_ctx",
@@ -20877,11 +20394,13 @@
    "source_file" : "external/boringssl/src/include/openssl/bytestring.h"
   },
   {
+   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
+   "size" : 240,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -20933,17 +20452,7 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 72,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIKN4bssl11VersionInfoE",
-   "size" : 16,
+   "size" : 32,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20959,16 +20468,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName>",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup>",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -20979,26 +20478,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool>",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -21049,16 +20528,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *>",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char>",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -21103,7 +20572,7 @@
    "name" : "const bssl::internal::StackAllocated<evp_aead_ctx_st, void, &EVP_AEAD_CTX_zero, &EVP_AEAD_CTX_cleanup>",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIKN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22892,7 +22361,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4608,
+     "field_offset" : 4736,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22900,7 +22369,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22928,22 +22397,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5056,
+     "field_offset" : 5184,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5568,
+     "field_offset" : 5696,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5632,
+     "field_offset" : 5760,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22951,7 +22420,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23717,7 +23186,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -23729,7 +23198,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 568,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -24056,6 +23525,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 416,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 896,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 960,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 1024,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 1088,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 144,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "meth",
+     "referenced_type" : "_ZTIP11rsa_meth_st"
+    },
+    {
+     "field_name" : "n",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "e",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "d",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1",
+     "field_offset" : 384,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1",
+     "field_offset" : 448,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "iqmp",
+     "field_offset" : 512,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 672,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "lock",
+     "field_offset" : 704,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "mont_n",
+     "field_offset" : 1152,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_p",
+     "field_offset" : 1216,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "mont_q",
+     "field_offset" : 1280,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "d_fixed",
+     "field_offset" : 1344,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmp1_fixed",
+     "field_offset" : 1408,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "dmq1_fixed",
+     "field_offset" : 1472,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "inv_small_mod_large_mont",
+     "field_offset" : 1536,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "num_blindings",
+     "field_offset" : 1600,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "blindings",
+     "field_offset" : 1664,
+     "referenced_type" : "_ZTIPP14bn_blinding_st"
+    },
+    {
+     "field_name" : "blindings_inuse",
+     "field_offset" : 1728,
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "field_name" : "blinding_fork_generation",
+     "field_offset" : 1792,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "private_key_frozen",
+     "field_offset" : 1856,
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "linker_set_key" : "_ZTI6rsa_st",
+   "name" : "rsa_st",
+   "referenced_type" : "_ZTI6rsa_st",
+   "self_type" : "_ZTI6rsa_st",
+   "size" : 240,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "num",
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "data",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIPPv"
+    },
+    {
+     "field_name" : "sorted",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "num_alloc",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "comp",
+     "field_offset" : 256,
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "linker_set_key" : "_ZTI8stack_st",
+   "name" : "stack_st",
+   "referenced_type" : "_ZTI8stack_st",
+   "self_type" : "_ZTI8stack_st",
+   "size" : 40,
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "d",
      "referenced_type" : "_ZTIPm"
     },
@@ -24464,41 +24176,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPK22SignatureAlgorithmName"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE"
     }
    ],
@@ -24534,76 +24211,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKN4bssl11VersionInfoE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKbEE"
     }
    ],
@@ -24779,41 +24386,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "size" : 16,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIPKc"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKhEE"
     }
    ],
@@ -26499,7 +26071,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_aead_ctx_stvXadL_Z17EVP_AEAD_CTX_zeroEEXadL_Z20EVP_AEAD_CTX_cleanupEEEE",
-   "size" : 584,
+   "size" : 600,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26522,7 +26094,7 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
    "self_type" : "_ZTIN4bssl8internal14StackAllocatedI15evp_hpke_ctx_stvXadL_Z17EVP_HPKE_CTX_zeroEEXadL_Z20EVP_HPKE_CTX_cleanupEEEE",
-   "size" : 712,
+   "size" : 728,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26787,20 +26359,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::internal::SpanBase<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE",
    "name" : "bssl::internal::SpanBase<const bssl::NamedGroup>",
    "record_kind" : "class",
@@ -26815,34 +26373,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "name" : "bssl::internal::SpanBase<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "name" : "bssl::internal::SpanBase<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKbEE",
    "name" : "bssl::internal::SpanBase<const bool>",
    "record_kind" : "class",
diff --git a/34/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
index c77cb312..9cf080da 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" : 56,
+   "size" : 48,
    "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" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6716,19 +6716,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 320,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 384,
-     "referenced_type" : "_ZTIKm"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6819,19 +6813,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 320,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 384,
-     "referenced_type" : "_ZTIKm"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9094,7 +9082,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9113,7 +9101,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
-   "size" : 56,
+   "size" : 48,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 6fd3721a..0ca73919 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,9 +1000,6 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
-   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjm"
   },
   {
@@ -11714,11 +11711,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12305,11 +12302,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12890,11 +12887,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14487,37 +14484,6 @@
   },
   {
    "function_name" : "android::GraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android19GraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_16ComponentWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::GraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjm",
    "parameters" :
    [
diff --git a/34/64/x86_64/source-based/libstagefright_foundation.so.lsdump b/34/64/x86_64/source-based/libstagefright_foundation.so.lsdump
index 995a8816..69d9b0e4 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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_64_static/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_64_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_64_static/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 677b5acc..5fb3cdec 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/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",
+   "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",
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -650,9 +650,6 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
-   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjm"
   },
   {
@@ -14021,7 +14018,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14042,7 +14039,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjP20OMX_BUFFERHEADERTYPEE",
@@ -14060,7 +14057,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14087,7 +14084,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14114,7 +14111,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14246,7 +14243,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjjP20OMX_BUFFERHEADERTYPEE",
@@ -15727,37 +15724,6 @@
   },
   {
    "function_name" : "android::OmxGraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android22OmxGraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_15IOmxNodeWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::OmxGraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjm",
    "parameters" :
    [
@@ -20421,8 +20387,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20475,8 +20441,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -21078,8 +21044,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -21942,8 +21908,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/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",
+   "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",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -22986,8 +22952,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -23166,8 +23132,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -23552,8 +23518,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/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",
+   "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",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24585,8 +24551,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/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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24786,8 +24752,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/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",
+   "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",
    "size" : 24,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -25049,8 +25015,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/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",
+   "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",
    "size" : 160,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -25483,8 +25449,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/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",
+   "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",
    "size" : 80,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27756,8 +27722,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/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",
+   "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",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27942,8 +27908,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/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",
+   "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",
    "size" : 12,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29265,8 +29231,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/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",
+   "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",
    "size" : 180,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29553,8 +29519,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/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",
+   "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",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -29741,8 +29707,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/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",
+   "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",
    "size" : 40,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -29981,7 +29947,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -29996,8 +29962,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/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",
+   "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",
    "size" : 96,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -30195,8 +30161,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/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",
+   "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",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h"
   },
@@ -30553,8 +30519,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/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",
+   "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",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32176,8 +32142,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/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",
+   "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",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h"
   },
@@ -32278,8 +32244,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/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",
+   "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",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -32926,15 +32892,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "other",
@@ -32945,8 +32911,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/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",
+   "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",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -33534,13 +33500,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/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",
+   "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",
    "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/e560d7b19ebf7276b3e850d3d346dec8/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/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
     "_ZTIj"
    ]
   },
@@ -33580,13 +33546,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/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",
+   "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",
    "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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
     "_ZTIN7android2wpINS_4hidl4base4V1_05IBaseEEE"
    ]
   },
@@ -33672,14 +33638,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/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",
+   "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",
    "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/e560d7b19ebf7276b3e850d3d346dec8/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/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ]
   },
   {
@@ -34670,13 +34636,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/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",
+   "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",
    "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/e560d7b19ebf7276b3e850d3d346dec8/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/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ],
    "vtable_components" :
    [
@@ -35714,7 +35680,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35804,13 +35770,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mBufferHeaderToBufferID",
      "field_offset" : 2688,
-     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35906,13 +35872,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mOutputBuffersWithCodec",
      "field_offset" : 4800,
-     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35923,8 +35889,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/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",
+   "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",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "vtable_components" :
@@ -43346,7 +43312,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "protected",
@@ -43357,8 +43323,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/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",
+   "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",
    "size" : 176,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "vtable_components" :
@@ -45391,15 +45357,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTION7android2spINS_7ABufferEEE",
    "name" : "android::sp<android::ABuffer> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ABufferEEE",
diff --git a/34/64/x86_64/source-based/libstagefright_omx_utils.so.lsdump b/34/64/x86_64/source-based/libstagefright_omx_utils.so.lsdump
index ff199615..794089c3 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24604,12 +24604,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 792,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
diff --git a/34/64/x86_64/source-based/libtinyalsa.so.lsdump b/34/64/x86_64/source-based/libtinyalsa.so.lsdump
index 2db911b9..3bd99c00 100644
--- a/34/64/x86_64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/x86_64/source-based/libtinyalsa.so.lsdump
@@ -218,9 +218,6 @@
    "name" : "pcm_get_subdevice"
   },
   {
-   "name" : "pcm_get_xruns"
-  },
-  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1301,18 +1298,6 @@
    "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
   },
   {
-   "function_name" : "pcm_get_xruns",
-   "linker_set_key" : "pcm_get_xruns",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP3pcm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
-  },
-  {
    "function_name" : "pcm_ioctl",
    "linker_set_key" : "pcm_ioctl",
    "parameters" :
diff --git a/34/64/x86_64/source-based/libui.so.lsdump b/34/64/x86_64/source-based/libui.so.lsdump
index 619eab16..f073f232 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -859,6 +859,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -867,10 +871,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1201,10 +1213,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1444,6 +1452,34 @@
    "name" : "_ZNK7android14Gralloc4Mapper17getAllocationSizeEPK13native_handlePm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINS_8hardware8graphics6common4V1_211PixelFormatEEEiRKNS3_6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS9_8hidl_vecIhEEPT_ESS_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS8_20StandardMetadataTypeEPFiRKNSD_8hidl_vecIhEEPT_ESR_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIjEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperImEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper18validateBufferSizeEPK13native_handlejjijmj"
   },
   {
@@ -1471,6 +1507,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1487,6 +1527,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1506,6 +1550,10 @@
    "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalIN4aidl7android8hardware8graphics6common9Smpte2086EEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSO_PNSE_8hidl_vecIhEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSM_PNSC_8hidl_vecIhEEE"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper4lockEPK13native_handlemRKNS_4RectEiP13android_ycbcr"
   },
   {
@@ -2294,6 +2342,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE14__erase_uniqueIS4_EEmRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE25__emplace_unique_key_argsIS4_JRKNS_21piecewise_construct_tENS_5tupleIJOS4_EEENSR_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeISC_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -2306,6 +2358,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6rehashEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE6removeENS_21__hash_const_iteratorIPNS_11__hash_nodeISC_PvEEEE"
   },
   {
@@ -2322,10 +2378,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
@@ -2338,11 +2402,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EmmS9_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvmEEES3_EERNS_9allocatorIS6_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
   },
   {
    "binding" : "weak",
@@ -2374,6 +2442,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLm128EEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2438,6 +2510,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
@@ -2450,10 +2530,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE6assignIPS6_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS6_NS_15iterator_traitsISD_E9referenceEEE5valueEvE4typeESD_SD_"
   },
   {
@@ -2462,11 +2558,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEm"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEm"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
@@ -2506,6 +2606,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE18__construct_at_endEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEEC2Em"
   },
   {
@@ -2522,6 +2630,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5eraseENS_11__wrap_iterIPKS4_EESB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLm128EEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLm128EEEE6resizeEm"
   },
   {
@@ -2538,10 +2654,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPKhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS8_E9referenceEEE5valueEvE4typeES8_S8_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEm"
   },
   {
@@ -2554,9 +2682,17 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEm"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "android_convertGralloc0To1Usage"
   },
   {
@@ -3871,7 +4007,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -3887,11 +4023,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -3900,7 +4036,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4092,7 +4228,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4108,71 +4244,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4492,7 +4628,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4500,7 +4636,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7262,7 +7398,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8244,11 +8380,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8835,11 +8971,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9420,11 +9556,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10736,7 +10872,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10754,7 +10890,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10787,7 +10923,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10802,7 +10938,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10820,7 +10956,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10838,7 +10974,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10865,7 +11001,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10910,7 +11046,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10928,7 +11064,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10949,7 +11085,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10973,7 +11109,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11009,7 +11145,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11048,7 +11184,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11084,7 +11220,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11123,7 +11259,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11156,7 +11292,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11174,7 +11310,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11210,7 +11346,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11231,7 +11367,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14377,6 +14513,19 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/PublicFormat.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::clear",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_5FenceEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::Fence>::~sp",
    "linker_set_key" : "_ZN7android2spINS_5FenceEED2Ev",
    "parameters" :
@@ -14406,6 +14555,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_",
    "parameters" :
@@ -14422,6 +14587,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V4_0::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_",
    "parameters" :
@@ -16104,12 +16285,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
@@ -22027,7 +22202,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22036,7 +22211,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22081,7 +22256,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22117,7 +22292,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22126,7 +22301,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22216,7 +22391,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22225,7 +22400,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22234,7 +22409,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22243,7 +22418,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22252,7 +22427,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22261,7 +22436,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22270,7 +22445,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22288,7 +22463,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22297,7 +22472,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22306,7 +22481,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22315,7 +22490,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22324,7 +22499,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22333,7 +22508,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22342,7 +22517,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22351,7 +22526,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22360,7 +22535,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22369,7 +22544,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22387,7 +22562,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22396,7 +22571,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22423,7 +22598,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22450,7 +22625,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -25375,7 +25550,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25515,7 +25690,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25553,7 +25728,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28100,7 +28275,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28156,7 +28331,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28320,7 +28495,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28417,7 +28592,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28576,7 +28751,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28764,7 +28939,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/x86_64/source-based/libunwindstack.so.lsdump b/34/64/x86_64/source-based/libunwindstack.so.lsdump
index 18e8d97a..0199cd09 100644
--- a/34/64/x86_64/source-based/libunwindstack.so.lsdump
+++ b/34/64/x86_64/source-based/libunwindstack.so.lsdump
@@ -101,6 +101,24 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextRiscv64.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIA45_j",
+   "name" : "unsigned int[45]",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIA45_j",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIA45_m",
+   "name" : "unsigned long[45]",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIA45_m",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "_ZTIA64_m",
    "name" : "unsigned long[64]",
@@ -220,367 +238,400 @@
    "name" : "AsmGetRegs"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
+   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
+   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
+   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
+   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs6_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs6_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
-   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE"
   },
   {
-   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
+   "name" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips645CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_pcEm"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_spEm"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C2Ev"
   },
   {
    "name" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE"
@@ -2471,6 +2522,45 @@
    "name" : "_ZN11unwindstack8MemoryXzD2Ev"
   },
   {
+   "name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcmEEE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips5CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_pcEm"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_spEm"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC2Ev"
+  },
+  {
    "name" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEmm"
   },
   {
@@ -3215,13 +3305,10 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
-  },
-  {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
   },
   {
    "binding" : "weak",
@@ -3282,6 +3369,9 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
+   "name" : "_ZTVN11unwindstack10RegsMips64E"
+  },
+  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3473,6 +3563,9 @@
    "name" : "_ZTVN11unwindstack8RegsImplImEE"
   },
   {
+   "name" : "_ZTVN11unwindstack8RegsMipsE"
+  },
+  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3536,9 +3629,6 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
-  },
-  {
-   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3710,6 +3800,48 @@
    "underlying_type" : "_ZTIm"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS32_EF_R0"
+    },
+    {
+     "enum_field_value" : 40,
+     "name" : "unwindstack::MIPS32_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "name" : "unwindstack::Mips32UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_EF_R0"
+    },
+    {
+     "enum_field_value" : 34,
+     "name" : "unwindstack::MIPS64_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "name" : "unwindstack::Mips64UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4040,6 +4172,163 @@
    "underlying_type" : "_ZTIt"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack7MipsRegE",
+   "name" : "unwindstack::MipsReg",
+   "referenced_type" : "_ZTIN11unwindstack7MipsRegE",
+   "self_type" : "_ZTIN11unwindstack7MipsRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4065,6 +4354,14 @@
     },
     {
      "enum_field_value" : 5,
+     "name" : "unwindstack::ARCH_MIPS"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::ARCH_MIPS64"
+    },
+    {
+     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4332,6 +4629,163 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS64_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS64_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS64_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS64_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS64_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS64_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS64_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS64_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS64_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS64_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS64_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS64_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS64_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS64_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS64_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS64_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS64_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS64_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS64_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS64_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS64_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS64_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS64_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS64_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS64_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS64_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS64_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS64_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS64_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS64_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS64_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack9Mips64RegE",
+   "name" : "unwindstack::Mips64Reg",
+   "referenced_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "self_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "unwindstack::X86_64_REG_RAX"
     },
     {
@@ -4437,6 +4891,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/Maps.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips64::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcmEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Arch",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Read",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Clone",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips645CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_pcEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_spEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
    "function_name" : "unwindstack::RegsX86_64::SetFromUcontext",
    "linker_set_key" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE",
    "parameters" :
@@ -7168,6 +7810,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsX86.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcmEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcmEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIm",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Arch",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Read",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Clone",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips5CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_pcEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_spEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "unwindstack::Unwinder::FillInFrame",
    "linker_set_key" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEmm",
@@ -8100,6 +8930,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64 *",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIPN11unwindstack10RegsMips64E",
+   "size" : 8,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64 *",
    "referenced_type" : "_ZTIN11unwindstack10RegsX86_64E",
@@ -8460,6 +9299,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips *",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIPN11unwindstack8RegsMipsE",
+   "size" : 8,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN11unwindstack8UnwinderE",
    "name" : "unwindstack::Unwinder *",
    "referenced_type" : "_ZTIN11unwindstack8UnwinderE",
@@ -8976,6 +9824,82 @@
      "referenced_type" : "_ZTIN11unwindstack8RegsImplImEE"
     }
    ],
+   "linker_set_key" : "_ZTIN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "size" : 48,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack10RegsMips64E"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips64D0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips644ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplImE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips642spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_pcEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips646set_spEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEtm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack10RegsMips645CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplImEE"
+    }
+   ],
    "linker_set_key" : "_ZTIN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64",
    "record_kind" : "class",
@@ -9699,6 +10623,32 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/SharedString.h"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_size",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack12mips_stack_tE",
+   "name" : "unwindstack::mips_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "self_type" : "_ZTIN11unwindstack12mips_stack_tE",
+   "size" : 12,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
@@ -10045,6 +10995,48 @@
      "referenced_type" : "_ZTIm"
     },
     {
+     "field_name" : "ss_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "name" : "unwindstack::mips64_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "self_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "size" : 24,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_j"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips_user_regsE",
+   "name" : "unwindstack::mips_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "self_type" : "_ZTIN11unwindstack14mips_user_regsE",
+   "size" : 180,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ss_sp",
+     "referenced_type" : "_ZTIm"
+    },
+    {
      "field_name" : "ss_flags",
      "field_offset" : 64,
      "referenced_type" : "_ZTIi"
@@ -10438,6 +11430,68 @@
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sc_regmask",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_status",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_regs",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIA32_m"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "name" : "unwindstack::mips_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_mcontext_tE",
+   "size" : 272,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIN11unwindstack12mips_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIN11unwindstack15mips_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "name" : "unwindstack::mips_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack15mips_ucontext_tE",
+   "size" : 296,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
@@ -10840,6 +11894,22 @@
    "fields" :
    [
     {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_m"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "name" : "unwindstack::mips64_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "self_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIm"
     }
@@ -11002,6 +12072,103 @@
    "fields" :
    [
     {
+     "field_name" : "sc_regs",
+     "referenced_type" : "_ZTIA32_m"
+    },
+    {
+     "field_name" : "sc_fpregs",
+     "field_offset" : 2048,
+     "referenced_type" : "_ZTIA32_m"
+    },
+    {
+     "field_name" : "sc_mdhi",
+     "field_offset" : 4096,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_hi1",
+     "field_offset" : 4160,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_hi2",
+     "field_offset" : 4224,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_hi3",
+     "field_offset" : 4288,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_mdlo",
+     "field_offset" : 4352,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_lo1",
+     "field_offset" : 4416,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_lo2",
+     "field_offset" : 4480,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_lo3",
+     "field_offset" : 4544,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 4608,
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "name" : "unwindstack::mips64_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "size" : 584,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "uc_flags",
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "uc_link",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIm"
+    },
+    {
+     "field_name" : "uc_stack",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE"
+    },
+    {
+     "field_name" : "uc_mcontext",
+     "field_offset" : 320,
+     "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "name" : "unwindstack::mips64_ucontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_ucontext_tE",
+   "size" : 624,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "field_name" : "regs",
      "referenced_type" : "_ZTIA32_m"
     }
@@ -12585,6 +13752,82 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "_ZTIN11unwindstack8RegsImplIjEE"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips",
+   "record_kind" : "class",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "size" : 48,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN11unwindstack8RegsMipsE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN11unwindstack8RegsMipsD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips4ArchEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsImplIjE7RawDataEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips2spEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_pcEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips6set_spEm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs11fallback_pcEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs20ResetPseudoRegistersEv"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17SetPseudoRegisterEtm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack4Regs17GetPseudoRegisterEtPm"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEmPNS_3ElfEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcmEEE"
+    },
+    {
+     "mangled_component_name" : "_ZN11unwindstack8RegsMips5CloneEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
diff --git a/34/64/x86_64/source-based/libutils.so.lsdump b/34/64/x86_64/source-based/libutils.so.lsdump
index 824acfb0..0e9f8c96 100644
--- a/34/64/x86_64/source-based/libutils.so.lsdump
+++ b/34/64/x86_64/source-based/libutils.so.lsdump
@@ -492,6 +492,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -737,6 +741,9 @@
    "name" : "_ZN7android7String813appendFormatVEPKcP13__va_list_tag"
   },
   {
+   "name" : "_ZN7android7String816convertToResPathEv"
+  },
+  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1215,6 +1222,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIimEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEmRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIimEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKmEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1235,10 +1246,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIimEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueImEEmRKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE17__deallocate_nodeEPNS_16__hash_node_baseIPNS_11__hash_nodeIS5_PvEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsImJRKmRS4_EEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS5_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1262,6 +1281,10 @@
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEE8__rehashEm"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImN7android6Looper7RequestEEENS_22__unordered_map_hasherImS5_NS_4hashImEELb1EEENS_21__unordered_map_equalImS5_NS_8equal_toImEELb1EEENS_9allocatorIS5_EEED2Ev"
+  },
+  {
    "name" : "_ZTv0_n24_N7android14LooperCallbackD0Ev"
   },
   {
@@ -5732,6 +5755,19 @@
    "source_file" : "system/core/libutils/include/utils/misc.h"
   },
   {
+   "function_name" : "android::sp<android::LooperCallback>::clear",
+   "linker_set_key" : "_ZN7android2spINS_14LooperCallbackEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14LooperCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::SimpleLooperCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_",
    "parameters" :
@@ -7007,6 +7043,19 @@
    "source_file" : "system/core/libutils/include/utils/String8.h"
   },
   {
+   "function_name" : "android::String8::convertToResPath",
+   "linker_set_key" : "_ZN7android7String816convertToResPathEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android7String8E"
+    }
+   ],
+   "return_type" : "_ZTIRN7android7String8E",
+   "source_file" : "system/core/libutils/include/utils/String8.h"
+  },
+  {
    "function_name" : "android::String8::clear",
    "linker_set_key" : "_ZN7android7String85clearEv",
    "parameters" :
diff --git a/34/64/x86_64/source-based/libxml2.so.lsdump b/34/64/x86_64/source-based/libxml2.so.lsdump
index d0f6925c..5a10b53c 100644
--- a/34/64/x86_64/source-based/libxml2.so.lsdump
+++ b/34/64/x86_64/source-based/libxml2.so.lsdump
@@ -718,9 +718,6 @@
    "name" : "xmlCtxtResetPush"
   },
   {
-   "name" : "xmlCtxtSetMaxAmplification"
-  },
-  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1405,9 +1402,6 @@
    "name" : "xmlMemShow"
   },
   {
-   "name" : "xmlMemSize"
-  },
-  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1921,9 +1915,6 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
-   "name" : "xmlParserInputBufferCreateString"
-  },
-  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3010,9 +3001,6 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
-   "name" : "xmlTextReaderSetMaxAmplification"
-  },
-  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5401,43 +5389,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "XML_ENC_ERR_SUCCESS"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "XML_ENC_ERR_SPACE"
-    },
-    {
-     "enum_field_value" : -2,
-     "name" : "XML_ENC_ERR_INPUT"
-    },
-    {
-     "enum_field_value" : -3,
-     "name" : "XML_ENC_ERR_PARTIAL"
-    },
-    {
-     "enum_field_value" : -4,
-     "name" : "XML_ENC_ERR_INTERNAL"
-    },
-    {
-     "enum_field_value" : -5,
-     "name" : "XML_ENC_ERR_MEMORY"
-    }
-   ],
-   "linker_set_key" : "_ZTI15xmlCharEncError",
-   "name" : "xmlCharEncError",
-   "referenced_type" : "_ZTI15xmlCharEncError",
-   "self_type" : "_ZTI15xmlCharEncError",
-   "size" : 4,
-   "source_file" : "external/libxml2/include/libxml/encoding.h",
-   "underlying_type" : "_ZTIi"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : -1,
      "name" : "XML_CHAR_ENCODING_ERROR"
     },
@@ -6020,10 +5971,6 @@
      "name" : "XML_ERR_COMMENT_ABRUPTLY_ENDED"
     },
     {
-     "enum_field_value" : 113,
-     "name" : "XML_WAR_ENCODING_MISMATCH"
-    },
-    {
      "enum_field_value" : 200,
      "name" : "XML_NS_ERR_XML_NAMESPACE"
     },
@@ -9543,10 +9490,6 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -14027,21 +13970,6 @@
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
-   "function_name" : "xmlCtxtSetMaxAmplification",
-   "linker_set_key" : "xmlCtxtSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlParserCtxt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/parser.h"
-  },
-  {
    "function_name" : "xmlCtxtUseOptions",
    "linker_set_key" : "xmlCtxtUseOptions",
    "parameters" :
@@ -17291,18 +17219,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
   },
   {
-   "function_name" : "xmlMemSize",
-   "linker_set_key" : "xmlMemSize",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIm",
-   "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
-  },
-  {
    "function_name" : "xmlMemStrdupLoc",
    "linker_set_key" : "xmlMemStrdupLoc",
    "parameters" :
@@ -19826,18 +19742,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlIO.h"
   },
   {
-   "function_name" : "xmlParserInputBufferCreateString",
-   "linker_set_key" : "xmlParserInputBufferCreateString",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    }
-   ],
-   "return_type" : "_ZTIP21_xmlParserInputBuffer",
-   "source_file" : "external/libxml2/include/private/io.h"
-  },
-  {
    "function_name" : "xmlParserInputBufferGrow",
    "linker_set_key" : "xmlParserInputBufferGrow",
    "parameters" :
@@ -22714,7 +22618,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25502,21 +25406,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlreader.h"
   },
   {
-   "function_name" : "xmlTextReaderSetMaxAmplification",
-   "linker_set_key" : "xmlTextReaderSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlTextReader"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/xmlreader.h"
-  },
-  {
    "function_name" : "xmlTextReaderSetParserProp",
    "linker_set_key" : "xmlTextReaderSetParserProp",
    "parameters" :
@@ -35409,18 +35298,13 @@
      "field_name" : "nbWarnings",
      "field_offset" : 6064,
      "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "maxAmpl",
-     "field_offset" : 6080,
-     "referenced_type" : "_ZTIj"
     }
    ],
    "linker_set_key" : "_ZTI14_xmlParserCtxt",
    "name" : "_xmlParserCtxt",
    "referenced_type" : "_ZTI14_xmlParserCtxt",
    "self_type" : "_ZTI14_xmlParserCtxt",
-   "size" : 768,
+   "size" : 760,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -36104,7 +35988,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "flags",
+     "field_name" : "standalone",
      "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 c0dfbbff..14894545 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/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -17,7 +17,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 1,
@@ -26,7 +26,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA32_h",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -184,36 +184,12 @@
    "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"
   },
   {
@@ -229,21 +205,6 @@
    "name" : "ABGRToUVRow_SSSE3"
   },
   {
-   "name" : "ABGRToYJRow_AVX2"
-  },
-  {
-   "name" : "ABGRToYJRow_Any_AVX2"
-  },
-  {
-   "name" : "ABGRToYJRow_Any_SSSE3"
-  },
-  {
-   "name" : "ABGRToYJRow_C"
-  },
-  {
-   "name" : "ABGRToYJRow_SSSE3"
-  },
-  {
    "name" : "ABGRToYRow_AVX2"
   },
   {
@@ -733,9 +694,6 @@
    "name" : "ARGBToI420"
   },
   {
-   "name" : "ARGBToI420Alpha"
-  },
-  {
    "name" : "ARGBToI422"
   },
   {
@@ -1123,24 +1081,6 @@
    "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"
   },
   {
@@ -1162,18 +1102,6 @@
    "name" : "DetileSplitUVRow_SSSE3"
   },
   {
-   "name" : "DetileToYUY2"
-  },
-  {
-   "name" : "DetileToYUY2_Any_SSE2"
-  },
-  {
-   "name" : "DetileToYUY2_C"
-  },
-  {
-   "name" : "DetileToYUY2_SSE2"
-  },
-  {
    "name" : "DivideRow_16_AVX2"
   },
   {
@@ -1213,6 +1141,9 @@
    "name" : "GetARGBBlend"
   },
   {
+   "name" : "GetXCR0"
+  },
+  {
    "name" : "H010ToAB30"
   },
   {
@@ -1330,9 +1261,6 @@
    "name" : "I010Copy"
   },
   {
-   "name" : "I010Rotate"
-  },
-  {
    "name" : "I010ToAB30"
   },
   {
@@ -1402,9 +1330,6 @@
    "name" : "I210Copy"
   },
   {
-   "name" : "I210Rotate"
-  },
-  {
    "name" : "I210ToAB30"
   },
   {
@@ -1504,9 +1429,6 @@
    "name" : "I212ToARGBRow_SSSE3"
   },
   {
-   "name" : "I212ToI420"
-  },
-  {
    "name" : "I212ToI422"
   },
   {
@@ -1567,12 +1489,6 @@
    "name" : "I410AlphaToARGBRow_SSSE3"
   },
   {
-   "name" : "I410Copy"
-  },
-  {
-   "name" : "I410Rotate"
-  },
-  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1612,15 +1528,9 @@
    "name" : "I410ToI010"
   },
   {
-   "name" : "I410ToI420"
-  },
-  {
    "name" : "I410ToI444"
   },
   {
-   "name" : "I412ToI420"
-  },
-  {
    "name" : "I412ToI444"
   },
   {
@@ -1729,9 +1639,6 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
-   "name" : "I420ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1888,18 +1795,6 @@
    "name" : "I422ToNV21"
   },
   {
-   "name" : "I422ToRAW"
-  },
-  {
-   "name" : "I422ToRGB24"
-  },
-  {
-   "name" : "I422ToRGB24Matrix"
-  },
-  {
-   "name" : "I422ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I422ToRGB24Row_AVX2"
   },
   {
@@ -1918,9 +1813,6 @@
    "name" : "I422ToRGB565"
   },
   {
-   "name" : "I422ToRGB565Matrix"
-  },
-  {
    "name" : "I422ToRGB565Row_AVX2"
   },
   {
@@ -2065,30 +1957,6 @@
    "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"
   },
   {
@@ -2185,12 +2053,6 @@
    "name" : "MM21ToNV12"
   },
   {
-   "name" : "MM21ToYUY2"
-  },
-  {
-   "name" : "MT2TToP010"
-  },
-  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -2221,6 +2083,12 @@
    "name" : "MergeARGBPlane"
   },
   {
+   "name" : "MergeARGBPlaneAlpha"
+  },
+  {
+   "name" : "MergeARGBPlaneOpaque"
+  },
+  {
    "name" : "MergeARGBRow_AVX2"
   },
   {
@@ -2266,15 +2134,9 @@
    "name" : "MergeUVRow_AVX2"
   },
   {
-   "name" : "MergeUVRow_AVX512BW"
-  },
-  {
    "name" : "MergeUVRow_Any_AVX2"
   },
   {
-   "name" : "MergeUVRow_Any_AVX512BW"
-  },
-  {
    "name" : "MergeUVRow_Any_SSE2"
   },
   {
@@ -2335,9 +2197,6 @@
    "name" : "MirrorPlane"
   },
   {
-   "name" : "MirrorRow_16_C"
-  },
-  {
    "name" : "MirrorRow_AVX2"
   },
   {
@@ -2563,15 +2422,9 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
-   "name" : "P010ToI010"
-  },
-  {
    "name" : "P010ToP410"
   },
   {
-   "name" : "P012ToI012"
-  },
-  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2857,9 +2710,6 @@
    "name" : "RGBScale"
   },
   {
-   "name" : "RiscvCpuCaps"
-  },
-  {
    "name" : "RotatePlane"
   },
   {
@@ -2872,9 +2722,6 @@
    "name" : "RotatePlane90"
   },
   {
-   "name" : "RotatePlane_16"
-  },
-  {
    "name" : "Scale"
   },
   {
@@ -3016,9 +2863,6 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
-   "name" : "ScalePlaneDown2_16To8"
-  },
-  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -3052,12 +2896,6 @@
    "name" : "ScalePlane_16"
   },
   {
-   "name" : "ScaleRowDown2Box_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Box_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -3085,12 +2923,6 @@
    "name" : "ScaleRowDown2Box_SSSE3"
   },
   {
-   "name" : "ScaleRowDown2Linear_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -3109,12 +2941,6 @@
    "name" : "ScaleRowDown2Linear_SSSE3"
   },
   {
-   "name" : "ScaleRowDown2_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -3544,6 +3370,12 @@
    "name" : "SplitARGBPlane"
   },
   {
+   "name" : "SplitARGBPlaneAlpha"
+  },
+  {
+   "name" : "SplitARGBPlaneOpaque"
+  },
+  {
    "name" : "SplitARGBRow_AVX2"
   },
   {
@@ -3670,24 +3502,9 @@
    "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"
   },
   {
@@ -3700,9 +3517,6 @@
    "name" : "TransposeUVWxH_C"
   },
   {
-   "name" : "TransposeWx8_16_C"
-  },
-  {
    "name" : "TransposeWx8_Any_SSSE3"
   },
   {
@@ -3718,9 +3532,6 @@
    "name" : "TransposeWx8_SSSE3"
   },
   {
-   "name" : "TransposeWxH_16_C"
-  },
-  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3847,9 +3658,6 @@
    "name" : "UYVYToYRow_SSE2"
   },
   {
-   "name" : "UnpackMT2T_C"
-  },
-  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3883,21 +3691,6 @@
    "name" : "YUY2ToNV12"
   },
   {
-   "name" : "YUY2ToNVUVRow_AVX2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_Any_AVX2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_Any_SSE2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_C"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_SSE2"
-  },
-  {
    "name" : "YUY2ToUV422Row_AVX2"
   },
   {
@@ -4139,7 +3932,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4180,7 +3973,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4213,7 +4006,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4526,7 +4319,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4775,7 +4568,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4803,7 +4596,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4827,7 +4620,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4857,7 +4650,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_AVX2",
@@ -4875,7 +4668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_AVX2",
@@ -4893,7 +4686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_SSSE3",
@@ -4911,7 +4704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4929,7 +4722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_SSSE3",
@@ -4947,7 +4740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4974,7 +4767,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_AVX2",
@@ -4992,7 +4785,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_AVX2",
@@ -5010,7 +4803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_SSSE3",
@@ -5028,7 +4821,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -5046,7 +4839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_SSSE3",
@@ -5064,7 +4857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -5091,7 +4884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -5130,112 +4923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ400",
-   "linker_set_key" : "ABGRToJ400",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ420",
-   "linker_set_key" : "ABGRToJ420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ422",
-   "linker_set_key" : "ABGRToJ422",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -5268,7 +4956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -5301,127 +4989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_AVX2",
@@ -5445,7 +5013,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_AVX2",
@@ -5469,7 +5037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_SSSE3",
@@ -5493,7 +5061,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -5517,7 +5085,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_SSSE3",
@@ -5541,97 +5109,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_AVX2",
@@ -5649,7 +5127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_AVX2",
@@ -5667,7 +5145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_SSSE3",
@@ -5685,7 +5163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -5703,7 +5181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_SSSE3",
@@ -5721,7 +5199,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -5748,7 +5226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -5766,7 +5244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -5793,7 +5271,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -5811,7 +5289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -5838,7 +5316,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -5856,7 +5334,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -5886,7 +5364,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -5907,7 +5385,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -5934,7 +5412,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -5961,7 +5439,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_AVX2",
@@ -5979,7 +5457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_AVX2",
@@ -5997,7 +5475,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_SSSE3",
@@ -6015,7 +5493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -6033,7 +5511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_SSSE3",
@@ -6051,7 +5529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -6078,7 +5556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_SSE2",
@@ -6096,7 +5574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -6114,7 +5592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_SSE2",
@@ -6132,7 +5610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -6171,7 +5649,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -6195,7 +5673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -6213,7 +5691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -6240,7 +5718,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_SSE2",
@@ -6258,7 +5736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -6276,7 +5754,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_SSE2",
@@ -6294,7 +5772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -6333,7 +5811,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -6357,7 +5835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -6375,7 +5853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -6408,7 +5886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_AVX2",
@@ -6429,7 +5907,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_AVX2",
@@ -6450,7 +5928,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_SSE2",
@@ -6471,7 +5949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -6492,7 +5970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_SSE2",
@@ -6513,7 +5991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -6537,7 +6015,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_SSE2",
@@ -6561,7 +6039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -6588,7 +6066,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_AVX2",
@@ -6606,7 +6084,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_AVX2",
@@ -6624,7 +6102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_SSSE3",
@@ -6642,7 +6120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -6660,7 +6138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_SSSE3",
@@ -6678,7 +6156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -6711,7 +6189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -6732,7 +6210,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_SSSE3",
@@ -6753,7 +6231,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -6789,7 +6267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -6819,7 +6297,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -6840,7 +6318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_SSSE3",
@@ -6861,7 +6339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -6891,7 +6369,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -6909,7 +6387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_X86",
@@ -6927,7 +6405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -6954,7 +6432,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -6981,7 +6459,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -7008,7 +6486,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_AVX2",
@@ -7026,7 +6504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_AVX2",
@@ -7044,7 +6522,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_SSE2",
@@ -7062,7 +6540,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -7080,7 +6558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_SSE2",
@@ -7098,7 +6576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -7125,7 +6603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_AVX2",
@@ -7143,7 +6621,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_AVX2",
@@ -7161,7 +6639,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_SSE2",
@@ -7179,7 +6657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -7197,7 +6675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_SSE2",
@@ -7215,7 +6693,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -7236,7 +6714,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -7263,7 +6741,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_AVX2",
@@ -7281,7 +6759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_AVX2",
@@ -7299,7 +6777,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_SSE2",
@@ -7317,7 +6795,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -7335,7 +6813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_SSE2",
@@ -7353,7 +6831,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -7380,7 +6858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -7398,7 +6876,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_SSSE3",
@@ -7416,7 +6894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -7443,7 +6921,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -7479,7 +6957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -7509,7 +6987,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -7533,7 +7011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_SSSE3",
@@ -7557,7 +7035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -7584,7 +7062,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_AVX2",
@@ -7602,7 +7080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_AVX2",
@@ -7620,7 +7098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_SSE2",
@@ -7638,7 +7116,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -7656,7 +7134,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_SSE2",
@@ -7674,7 +7152,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -7707,7 +7185,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_AVX2",
@@ -7728,7 +7206,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_AVX2",
@@ -7749,7 +7227,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_SSE2",
@@ -7770,7 +7248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -7791,7 +7269,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_SSE2",
@@ -7812,7 +7290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -7842,7 +7320,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_AVX2",
@@ -7863,7 +7341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -7884,7 +7362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_SSE2",
@@ -7905,7 +7383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -7941,7 +7419,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -7965,7 +7443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_SSE2",
@@ -7989,7 +7467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -8019,37 +7497,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBRotate",
-   "linker_set_key" : "ARGBRotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -8076,7 +7524,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -8091,7 +7539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_SSSE3",
@@ -8106,7 +7554,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -8124,7 +7572,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_X86",
@@ -8142,7 +7590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -8172,7 +7620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -8193,7 +7641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_SSE2",
@@ -8214,7 +7662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -8244,7 +7692,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_AVX2",
@@ -8265,7 +7713,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_AVX2",
@@ -8286,7 +7734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_SSSE3",
@@ -8307,7 +7755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -8328,7 +7776,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_SSSE3",
@@ -8349,7 +7797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -8376,7 +7824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -8403,7 +7851,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -8430,7 +7878,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -8463,7 +7911,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_AVX2",
@@ -8484,7 +7932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_AVX2",
@@ -8505,7 +7953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_SSE2",
@@ -8526,7 +7974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -8547,7 +7995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_SSE2",
@@ -8568,7 +8016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -8595,7 +8043,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_AVX2",
@@ -8613,7 +8061,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_AVX2",
@@ -8631,7 +8079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_SSSE3",
@@ -8649,7 +8097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -8667,7 +8115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_SSSE3",
@@ -8685,34 +8133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToABGR",
-   "linker_set_key" : "ARGBToABGR",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -8739,7 +8160,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_AVX2",
@@ -8757,7 +8178,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_AVX2",
@@ -8775,7 +8196,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_SSSE3",
@@ -8793,7 +8214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -8811,7 +8232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_SSSE3",
@@ -8829,7 +8250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -8856,7 +8277,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_AVX2",
@@ -8874,7 +8295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_AVX2",
@@ -8892,7 +8313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_SSSE3",
@@ -8910,7 +8331,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -8928,7 +8349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_SSSE3",
@@ -8946,7 +8367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -8973,7 +8394,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_SSE2",
@@ -8991,7 +8412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -9009,7 +8430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_SSE2",
@@ -9027,7 +8448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -9054,7 +8475,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_SSE2",
@@ -9072,7 +8493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -9090,7 +8511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_SSE2",
@@ -9108,34 +8529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToBGRA",
-   "linker_set_key" : "ARGBToBGRA",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -9162,7 +8556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -9201,52 +8595,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToI420Alpha",
-   "linker_set_key" : "ARGBToI420Alpha",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -9285,7 +8634,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -9324,7 +8673,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -9351,7 +8700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -9390,7 +8739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -9429,7 +8778,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -9462,7 +8811,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -9495,7 +8844,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -9522,7 +8871,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_AVX2",
@@ -9540,7 +8889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_AVX2",
@@ -9558,7 +8907,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_SSSE3",
@@ -9576,7 +8925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -9594,7 +8943,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_SSSE3",
@@ -9612,7 +8961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -9639,7 +8988,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX2",
@@ -9657,7 +9006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX512VBMI",
@@ -9675,7 +9024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX2",
@@ -9693,7 +9042,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX512VBMI",
@@ -9711,7 +9060,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_SSSE3",
@@ -9729,7 +9078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -9747,7 +9096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_SSSE3",
@@ -9765,7 +9114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -9792,7 +9141,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -9822,7 +9171,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_AVX2",
@@ -9836,14 +9185,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_AVX2",
@@ -9864,7 +9213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_SSE2",
@@ -9885,7 +9234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -9899,14 +9248,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_SSE2",
@@ -9920,14 +9269,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_SSE2",
@@ -9945,7 +9294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -9963,7 +9312,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_SSE2",
@@ -9981,7 +9330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -10008,7 +9357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_SSSE3",
@@ -10029,7 +9378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -10050,7 +9399,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_SSSE3",
@@ -10071,7 +9420,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_AVX2",
@@ -10095,7 +9444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_AVX2",
@@ -10119,7 +9468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_SSSE3",
@@ -10143,7 +9492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -10167,7 +9516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_SSSE3",
@@ -10191,7 +9540,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_AVX2",
@@ -10215,7 +9564,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_AVX2",
@@ -10239,7 +9588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_SSSE3",
@@ -10263,7 +9612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -10287,7 +9636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_SSSE3",
@@ -10311,7 +9660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -10338,7 +9687,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_AVX2",
@@ -10356,7 +9705,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_AVX2",
@@ -10374,7 +9723,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_SSSE3",
@@ -10392,7 +9741,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -10410,7 +9759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_SSSE3",
@@ -10428,7 +9777,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_AVX2",
@@ -10446,7 +9795,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_AVX2",
@@ -10464,7 +9813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_SSSE3",
@@ -10482,7 +9831,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -10500,7 +9849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_SSSE3",
@@ -10518,7 +9867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -10545,7 +9894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -10572,7 +9921,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_AVX2",
@@ -10590,7 +9939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_AVX2",
@@ -10608,7 +9957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_SSE2",
@@ -10626,7 +9975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -10644,7 +9993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_SSE2",
@@ -10662,7 +10011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -10695,7 +10044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -10728,7 +10077,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -10749,7 +10098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -10770,7 +10119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -10788,7 +10137,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -10830,7 +10179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -10872,7 +10221,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -10917,7 +10266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -10971,7 +10320,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -11028,7 +10377,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -11040,7 +10389,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -11067,7 +10416,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -11106,7 +10455,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_SSSE3",
@@ -11130,7 +10479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -11154,7 +10503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_SSSE3",
@@ -11178,7 +10527,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_SSSE3",
@@ -11196,7 +10545,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -11214,7 +10563,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_SSSE3",
@@ -11232,7 +10581,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -11271,7 +10620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_AVX2",
@@ -11295,7 +10644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_AVX2",
@@ -11319,7 +10668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_SSSE3",
@@ -11343,7 +10692,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -11367,7 +10716,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_SSSE3",
@@ -11391,7 +10740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -11412,7 +10761,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -11433,7 +10782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -11460,7 +10809,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -11487,7 +10836,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -11499,25 +10848,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -11538,7 +10869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_SSE2",
@@ -11559,7 +10890,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -11577,7 +10908,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -11595,7 +10926,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -11622,7 +10953,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -11652,7 +10983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_AVX2",
@@ -11673,7 +11004,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_AVX2",
@@ -11694,7 +11025,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_SSSE3",
@@ -11715,7 +11046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -11736,7 +11067,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_SSSE3",
@@ -11757,7 +11088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -11787,7 +11118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_AVX2",
@@ -11808,7 +11139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_AVX2",
@@ -11829,7 +11160,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_SSE2",
@@ -11850,7 +11181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -11871,7 +11202,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_SSE2",
@@ -11892,7 +11223,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -11934,7 +11265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -11979,7 +11310,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -12036,7 +11367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -12066,7 +11397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -12096,7 +11427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -12123,7 +11454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -12150,7 +11481,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -12168,7 +11499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_AVX",
@@ -12186,7 +11517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_AVX",
@@ -12204,7 +11535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_SSE2",
@@ -12222,7 +11553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -12240,7 +11571,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_ERMS",
@@ -12258,7 +11589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_SSE2",
@@ -12276,7 +11607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -12294,7 +11625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -12321,7 +11652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_SSE2",
@@ -12348,7 +11679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -12377,143 +11708,8 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetilePlane_16",
-   "linker_set_key" : "DetilePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_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/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"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_SSE2",
@@ -12534,7 +11730,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -12555,7 +11751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_SSE2",
@@ -12576,7 +11772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -12612,7 +11808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_SSSE3",
@@ -12636,7 +11832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -12660,7 +11856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_SSSE3",
@@ -12684,124 +11880,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2",
-   "linker_set_key" : "DetileToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_Any_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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_AVX2",
@@ -12822,7 +11901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_AVX2",
@@ -12843,7 +11922,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -12864,7 +11943,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -12879,7 +11958,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_X86",
@@ -12894,7 +11973,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -12909,7 +11988,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_X86",
@@ -12924,37 +12003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::GaussCol_C",
-   "linker_set_key" : "GaussCol_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -12984,7 +12033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -13011,25 +12060,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::GaussRow_C",
-   "linker_set_key" : "GaussRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKj"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -13047,13 +12078,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -13092,7 +12123,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -13131,7 +12162,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -13170,7 +12201,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -13209,7 +12240,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -13248,7 +12279,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -13287,7 +12318,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -13326,7 +12357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -13365,7 +12396,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -13404,7 +12435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -13443,7 +12474,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -13482,7 +12513,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -13521,7 +12552,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -13560,7 +12591,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -13599,7 +12630,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -13638,7 +12669,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -13677,7 +12708,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -13716,7 +12747,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -13755,7 +12786,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -13794,7 +12825,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -13824,7 +12855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_AVX2",
@@ -13845,7 +12876,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_AVX2",
@@ -13866,7 +12897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_SSE2",
@@ -13887,7 +12918,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -13908,7 +12939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_SSE2",
@@ -13929,7 +12960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -13962,7 +12993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_AVX2",
@@ -13989,7 +13020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -14016,7 +13047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_SSSE3",
@@ -14043,7 +13074,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_AVX2",
@@ -14061,7 +13092,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -14079,7 +13110,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSE42",
@@ -14097,7 +13128,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSSE3",
@@ -14115,7 +13146,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -14133,7 +13164,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -14151,7 +13182,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_SSE41",
@@ -14169,7 +13200,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -14220,7 +13251,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -14274,7 +13305,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -14325,61 +13356,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I010Rotate",
-   "linker_set_key" : "I010Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -14418,7 +13395,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -14457,7 +13434,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -14496,7 +13473,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -14538,7 +13515,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -14583,7 +13560,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -14622,7 +13599,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -14664,7 +13641,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -14709,7 +13686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -14760,7 +13737,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -14811,7 +13788,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -14856,7 +13833,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -14898,7 +13875,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -14940,7 +13917,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -14991,7 +13968,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -15036,7 +14013,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -15087,7 +14064,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -15141,7 +14118,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_AVX2",
@@ -15171,7 +14148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_Any_AVX2",
@@ -15201,7 +14178,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_Any_SSSE3",
@@ -15231,7 +14208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -15261,7 +14238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_SSSE3",
@@ -15291,7 +14268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -15342,61 +14319,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I210Rotate",
-   "linker_set_key" : "I210Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -15435,7 +14358,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -15474,7 +14397,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -15513,7 +14436,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -15555,7 +14478,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -15600,7 +14523,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_AVX2",
@@ -15627,7 +14550,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_AVX2",
@@ -15654,7 +14577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_SSSE3",
@@ -15681,7 +14604,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -15708,7 +14631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_SSSE3",
@@ -15735,7 +14658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -15774,7 +14697,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -15816,7 +14739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -15861,7 +14784,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_AVX2",
@@ -15888,7 +14811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_AVX2",
@@ -15915,7 +14838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_SSSE3",
@@ -15942,7 +14865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -15969,7 +14892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_SSSE3",
@@ -15996,7 +14919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -16047,7 +14970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -16098,7 +15021,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -16149,7 +15072,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -16200,7 +15123,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -16245,7 +15168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_AVX2",
@@ -16272,7 +15195,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_AVX2",
@@ -16299,7 +15222,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_SSSE3",
@@ -16326,7 +15249,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -16353,7 +15276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_SSSE3",
@@ -16380,7 +15303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_AVX2",
@@ -16407,7 +15330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_AVX2",
@@ -16434,7 +15357,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_SSSE3",
@@ -16461,7 +15384,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -16488,7 +15411,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_SSSE3",
@@ -16515,58 +15438,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I212ToI420",
-   "linker_set_key" : "I212ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -16617,7 +15489,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -16662,7 +15534,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -16689,7 +15561,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -16716,7 +15588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -16743,7 +15615,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -16773,7 +15645,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_AVX2",
@@ -16794,7 +15666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_AVX2",
@@ -16815,7 +15687,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_SSE2",
@@ -16836,7 +15708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -16857,7 +15729,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_SSE2",
@@ -16878,7 +15750,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -16905,7 +15777,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -16944,7 +15816,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -16977,7 +15849,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -17028,7 +15900,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_AVX2",
@@ -17058,7 +15930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_Any_AVX2",
@@ -17088,7 +15960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_Any_SSSE3",
@@ -17118,7 +15990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -17148,7 +16020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_SSSE3",
@@ -17178,112 +16050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I410Copy",
-   "linker_set_key" : "I410Copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I410Rotate",
-   "linker_set_key" : "I410Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -17325,7 +16092,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_AVX2",
@@ -17352,7 +16119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_AVX2",
@@ -17379,7 +16146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_SSSE3",
@@ -17406,7 +16173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -17433,7 +16200,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_SSSE3",
@@ -17460,7 +16227,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -17502,7 +16269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_AVX2",
@@ -17529,7 +16296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_AVX2",
@@ -17556,7 +16323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_SSSE3",
@@ -17583,7 +16350,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -17610,7 +16377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_SSSE3",
@@ -17637,7 +16404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -17688,58 +16455,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I410ToI420",
-   "linker_set_key" : "I410ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -17790,58 +16506,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I412ToI420",
-   "linker_set_key" : "I412ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -17892,7 +16557,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -17940,7 +16605,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -17988,7 +16653,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -18039,7 +16704,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -18093,7 +16758,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -18168,7 +16833,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -18219,7 +16884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -18291,7 +16956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -18342,7 +17007,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -18393,7 +17058,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -18441,7 +17106,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -18495,7 +17160,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -18555,7 +17220,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -18615,7 +17280,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -18675,7 +17340,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -18726,7 +17391,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -18765,7 +17430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -18804,7 +17469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -18843,7 +17508,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -18885,7 +17550,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -18924,7 +17589,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -18963,7 +17628,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -19002,7 +17667,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -19044,7 +17709,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -19089,7 +17754,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -19128,7 +17793,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -19179,7 +17844,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -19230,7 +17895,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -19269,7 +17934,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -19320,7 +17985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -19371,7 +18036,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -19416,7 +18081,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -19461,7 +18126,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -19500,7 +18165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -19539,7 +18204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -19581,52 +18246,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I420ToRGB24MatrixFilter",
-   "linker_set_key" : "I420ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -19665,7 +18285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -19707,7 +18327,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -19749,7 +18369,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -19788,7 +18408,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -19830,7 +18450,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -19869,7 +18489,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -19908,7 +18528,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -19956,7 +18576,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -20004,7 +18624,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -20055,7 +18675,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -20109,7 +18729,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_AVX2",
@@ -20139,7 +18759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_AVX2",
@@ -20169,7 +18789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_SSSE3",
@@ -20199,7 +18819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -20229,7 +18849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_SSSE3",
@@ -20259,7 +18879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -20310,7 +18930,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -20364,7 +18984,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -20424,7 +19044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -20484,7 +19104,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -20544,7 +19164,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -20583,7 +19203,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_AVX2",
@@ -20610,7 +19230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_AVX2",
@@ -20637,7 +19257,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_SSSE3",
@@ -20664,7 +19284,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -20691,7 +19311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_SSSE3",
@@ -20718,7 +19338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -20757,7 +19377,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_AVX2",
@@ -20784,7 +19404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_AVX2",
@@ -20811,7 +19431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_SSSE3",
@@ -20838,7 +19458,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -20865,7 +19485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_SSSE3",
@@ -20892,7 +19512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_AVX2",
@@ -20919,7 +19539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_AVX2",
@@ -20946,7 +19566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_SSSE3",
@@ -20973,7 +19593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -21000,7 +19620,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_SSSE3",
@@ -21027,7 +19647,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -21069,7 +19689,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -21114,7 +19734,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX2",
@@ -21141,7 +19761,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX512BW",
@@ -21168,7 +19788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX2",
@@ -21195,7 +19815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX512BW",
@@ -21222,7 +19842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_SSSE3",
@@ -21249,7 +19869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -21276,7 +19896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_SSSE3",
@@ -21303,7 +19923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -21342,7 +19962,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -21393,7 +20013,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -21444,7 +20064,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -21495,7 +20115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -21540,172 +20160,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRAW",
-   "linker_set_key" : "I422ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24",
-   "linker_set_key" : "I422ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24Matrix",
-   "linker_set_key" : "I422ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24MatrixFilter",
-   "linker_set_key" : "I422ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_AVX2",
@@ -21732,7 +20187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_AVX2",
@@ -21759,7 +20214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_SSSE3",
@@ -21786,7 +20241,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -21813,7 +20268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_SSSE3",
@@ -21840,7 +20295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -21879,49 +20334,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB565Matrix",
-   "linker_set_key" : "I422ToRGB565Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_AVX2",
@@ -21948,7 +20361,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_AVX2",
@@ -21975,7 +20388,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_SSSE3",
@@ -22002,7 +20415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -22029,7 +20442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_SSSE3",
@@ -22056,7 +20469,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -22095,7 +20508,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -22137,7 +20550,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_AVX2",
@@ -22164,7 +20577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_AVX2",
@@ -22191,7 +20604,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_SSSE3",
@@ -22218,7 +20631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -22245,7 +20658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_SSSE3",
@@ -22272,7 +20685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -22311,7 +20724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_AVX2",
@@ -22335,7 +20748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_AVX2",
@@ -22359,7 +20772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_SSE2",
@@ -22383,7 +20796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -22407,7 +20820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_SSE2",
@@ -22431,7 +20844,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -22470,7 +20883,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_AVX2",
@@ -22494,7 +20907,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_AVX2",
@@ -22518,7 +20931,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_SSE2",
@@ -22542,7 +20955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -22566,7 +20979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_SSE2",
@@ -22590,7 +21003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -22638,7 +21051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -22686,7 +21099,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -22737,7 +21150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_AVX2",
@@ -22767,7 +21180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_AVX2",
@@ -22797,7 +21210,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_SSSE3",
@@ -22827,7 +21240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -22857,7 +21270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_SSSE3",
@@ -22887,7 +21300,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -22938,7 +21351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -22992,7 +21405,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -23052,7 +21465,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -23112,7 +21525,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -23172,7 +21585,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -23211,7 +21624,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -23250,7 +21663,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -23292,7 +21705,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_AVX2",
@@ -23319,7 +21732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_AVX2",
@@ -23346,7 +21759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_SSSE3",
@@ -23373,7 +21786,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -23400,7 +21813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_SSSE3",
@@ -23427,7 +21840,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -23478,7 +21891,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -23523,7 +21936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -23568,268 +21981,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRAW",
-   "linker_set_key" : "I444ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24",
-   "linker_set_key" : "I444ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Matrix",
-   "linker_set_key" : "I444ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_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"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -23865,7 +22023,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -23901,7 +22059,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_AVX2",
@@ -23928,7 +22086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_AVX2",
@@ -23955,7 +22113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -23982,7 +22140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -24006,7 +22164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_AVX2",
@@ -24030,7 +22188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_AVX2",
@@ -24054,7 +22212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_SSSE3",
@@ -24078,7 +22236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -24102,7 +22260,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_SSSE3",
@@ -24126,7 +22284,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -24153,7 +22311,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_SSE2",
@@ -24171,7 +22329,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -24189,7 +22347,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_SSE2",
@@ -24207,7 +22365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -24246,7 +22404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -24285,7 +22443,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -24324,7 +22482,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -24363,7 +22521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -24402,7 +22560,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -24441,7 +22599,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -24480,7 +22638,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -24519,7 +22677,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -24558,7 +22716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -24579,7 +22737,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -24612,7 +22770,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -24657,7 +22815,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -24696,7 +22854,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -24735,7 +22893,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -24780,7 +22938,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -24819,79 +22977,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MM21ToYUY2",
-   "linker_set_key" : "MM21ToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MT2TToP010",
-   "linker_set_key" : "MT2TToP010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -24903,7 +22989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -24951,7 +23037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_AVX2",
@@ -24981,7 +23067,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_AVX2",
@@ -25011,7 +23097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -25041,7 +23127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -25089,7 +23175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_AVX2",
@@ -25119,7 +23205,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_AVX2",
@@ -25149,7 +23235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -25179,7 +23265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -25224,7 +23310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_AVX2",
@@ -25251,7 +23337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_AVX2",
@@ -25278,7 +23364,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_SSE2",
@@ -25305,7 +23391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -25332,7 +23418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_SSE2",
@@ -25359,7 +23445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -25398,7 +23484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_Any_SSSE3",
@@ -25422,7 +23508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -25446,7 +23532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_SSSE3",
@@ -25470,7 +23556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -25503,7 +23589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -25539,7 +23625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_AVX2",
@@ -25563,7 +23649,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_AVX2",
@@ -25587,7 +23673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -25611,7 +23697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_AVX2",
@@ -25632,28 +23718,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_AVX2",
@@ -25674,28 +23739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_SSE2",
@@ -25716,7 +23760,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -25737,7 +23781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_SSE2",
@@ -25758,7 +23802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -25800,7 +23844,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_AVX2",
@@ -25827,7 +23871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_AVX2",
@@ -25854,7 +23898,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -25881,7 +23925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_AVX2",
@@ -25908,7 +23952,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_AVX2",
@@ -25935,7 +23979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -25962,7 +24006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_AVX2",
@@ -25989,7 +24033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_AVX2",
@@ -26016,7 +24060,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -26043,7 +24087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_AVX2",
@@ -26067,7 +24111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_AVX2",
@@ -26091,7 +24135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_SSE2",
@@ -26115,7 +24159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -26139,7 +24183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_SSE2",
@@ -26163,7 +24207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -26175,7 +24219,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -26202,25 +24246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::MirrorRow_16_C",
-   "linker_set_key" : "MirrorRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_AVX2",
@@ -26238,7 +24264,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_AVX2",
@@ -26256,7 +24282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_SSSE3",
@@ -26274,7 +24300,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -26292,7 +24318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_SSSE3",
@@ -26310,7 +24336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -26331,7 +24357,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_SSSE3",
@@ -26352,7 +24378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -26379,7 +24405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_AVX2",
@@ -26397,7 +24423,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_AVX2",
@@ -26415,7 +24441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_SSSE3",
@@ -26433,7 +24459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -26451,7 +24477,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_SSSE3",
@@ -26469,7 +24495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_AVX2",
@@ -26490,7 +24516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_AVX2",
@@ -26511,7 +24537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -26532,7 +24558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -26571,7 +24597,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -26610,7 +24636,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -26658,7 +24684,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -26691,7 +24717,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -26724,7 +24750,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -26760,7 +24786,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_AVX2",
@@ -26784,7 +24810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_AVX2",
@@ -26808,7 +24834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_SSSE3",
@@ -26832,7 +24858,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -26856,7 +24882,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_SSSE3",
@@ -26880,7 +24906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -26925,7 +24951,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -26973,7 +24999,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -27012,7 +25038,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -27045,7 +25071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -27078,7 +25104,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -27114,7 +25140,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_AVX2",
@@ -27138,7 +25164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_AVX2",
@@ -27162,7 +25188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_SSSE3",
@@ -27186,7 +25212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -27210,7 +25236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_SSSE3",
@@ -27234,7 +25260,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -27267,7 +25293,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -27303,7 +25329,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_AVX2",
@@ -27327,7 +25353,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_AVX2",
@@ -27351,7 +25377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_SSSE3",
@@ -27375,7 +25401,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -27399,7 +25425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_SSSE3",
@@ -27423,7 +25449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -27462,7 +25488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -27501,7 +25527,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -27534,7 +25560,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -27567,7 +25593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -27603,7 +25629,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_AVX2",
@@ -27627,7 +25653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_AVX2",
@@ -27651,7 +25677,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_SSSE3",
@@ -27675,7 +25701,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -27699,7 +25725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_SSSE3",
@@ -27723,7 +25749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -27768,7 +25794,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -27807,7 +25833,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -27840,7 +25866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -27873,7 +25899,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -27909,7 +25935,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_AVX2",
@@ -27933,7 +25959,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_AVX2",
@@ -27957,7 +25983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_SSSE3",
@@ -27981,7 +26007,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -28005,7 +26031,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_SSSE3",
@@ -28029,7 +26055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -28062,7 +26088,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_AVX2",
@@ -28083,7 +26109,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_AVX2",
@@ -28104,7 +26130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_SSSE3",
@@ -28125,7 +26151,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -28146,7 +26172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_SSSE3",
@@ -28167,7 +26193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -28203,7 +26229,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -28242,7 +26268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -28278,7 +26304,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -28317,52 +26343,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::P010ToI010",
-   "linker_set_key" : "P010ToI010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -28401,52 +26382,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::P012ToI012",
-   "linker_set_key" : "P012ToI012",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -28482,7 +26418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -28521,7 +26457,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_AVX2",
@@ -28545,7 +26481,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_AVX2",
@@ -28569,7 +26505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_SSSE3",
@@ -28593,7 +26529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -28617,7 +26553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_SSSE3",
@@ -28641,7 +26577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -28677,7 +26613,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -28716,7 +26652,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_AVX2",
@@ -28740,7 +26676,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_AVX2",
@@ -28764,7 +26700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_SSSE3",
@@ -28788,7 +26724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -28812,7 +26748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_SSSE3",
@@ -28836,7 +26772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -28875,7 +26811,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_AVX2",
@@ -28899,7 +26835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_AVX2",
@@ -28923,7 +26859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_SSSE3",
@@ -28947,7 +26883,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -28971,7 +26907,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_SSSE3",
@@ -28995,7 +26931,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_AVX2",
@@ -29019,7 +26955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_AVX2",
@@ -29043,7 +26979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_SSSE3",
@@ -29067,7 +27003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -29091,7 +27027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_SSSE3",
@@ -29115,7 +27051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -29142,7 +27078,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_SSSE3",
@@ -29160,7 +27096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -29178,7 +27114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_SSSE3",
@@ -29196,7 +27132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -29235,7 +27171,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -29262,7 +27198,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -29301,7 +27237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -29334,7 +27270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -29361,7 +27297,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_SSSE3",
@@ -29379,7 +27315,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -29397,7 +27333,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_SSSE3",
@@ -29415,7 +27351,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -29442,7 +27378,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_SSSE3",
@@ -29460,7 +27396,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -29478,7 +27414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_SSSE3",
@@ -29496,7 +27432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -29520,7 +27456,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -29544,7 +27480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_AVX2",
@@ -29562,7 +27498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_AVX2",
@@ -29580,7 +27516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_SSSE3",
@@ -29598,7 +27534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -29616,7 +27552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_SSSE3",
@@ -29634,7 +27570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -29652,7 +27588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -29679,7 +27615,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_SSSE3",
@@ -29697,7 +27633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -29715,7 +27651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_SSSE3",
@@ -29733,7 +27669,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -29760,7 +27696,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_SSSE3",
@@ -29778,7 +27714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -29796,7 +27732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_SSSE3",
@@ -29814,7 +27750,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -29853,7 +27789,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -29880,7 +27816,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -29919,7 +27855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -29943,7 +27879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -29967,7 +27903,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_AVX2",
@@ -29985,7 +27921,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_AVX2",
@@ -30003,7 +27939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_SSSE3",
@@ -30021,7 +27957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -30039,7 +27975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_SSSE3",
@@ -30057,7 +27993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -30075,7 +28011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -30102,7 +28038,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_SSE2",
@@ -30120,7 +28056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -30138,7 +28074,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_SSE2",
@@ -30156,7 +28092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -30195,7 +28131,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -30219,7 +28155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -30237,7 +28173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -30264,7 +28200,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -30303,7 +28239,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -30330,31 +28266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::RGBAToUVJRow_C",
-   "linker_set_key" : "RGBAToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_SSSE3",
@@ -30378,7 +28290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -30402,7 +28314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_SSSE3",
@@ -30426,7 +28338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_AVX2",
@@ -30444,7 +28356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_AVX2",
@@ -30462,7 +28374,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_SSSE3",
@@ -30480,7 +28392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -30498,7 +28410,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_SSSE3",
@@ -30516,7 +28428,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_SSSE3",
@@ -30534,7 +28446,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -30552,7 +28464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_SSSE3",
@@ -30570,7 +28482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -30600,7 +28512,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -30630,7 +28542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -30648,7 +28560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_X86",
@@ -30666,7 +28578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -30702,19 +28614,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_rgb.h"
-  },
-  {
-   "function_name" : "libyuv::RiscvCpuCaps",
-   "linker_set_key" : "RiscvCpuCaps",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -30744,7 +28644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -30771,7 +28671,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -30798,7 +28698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -30825,37 +28725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
-  },
-  {
-   "function_name" : "libyuv::RotatePlane_16",
-   "linker_set_key" : "RotatePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -30915,7 +28785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -30939,7 +28809,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -30963,7 +28833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_SSE2",
@@ -30987,7 +28857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -31011,7 +28881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_SSE2",
@@ -31035,7 +28905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -31059,7 +28929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -31083,7 +28953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_SSSE3",
@@ -31107,7 +28977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_SSE2",
@@ -31128,7 +28998,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -31149,7 +29019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_SSE2",
@@ -31170,7 +29040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_SSE2",
@@ -31191,7 +29061,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -31212,7 +29082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_SSE2",
@@ -31233,7 +29103,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_SSE2",
@@ -31254,7 +29124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -31275,7 +29145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_SSE2",
@@ -31296,7 +29166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_SSE2",
@@ -31320,7 +29190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -31344,7 +29214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_SSE2",
@@ -31368,7 +29238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_SSE2",
@@ -31392,7 +29262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -31416,7 +29286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_SSE2",
@@ -31440,7 +29310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -31458,7 +29328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_AVX2",
@@ -31476,7 +29346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_AVX2",
@@ -31494,7 +29364,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_SSE2",
@@ -31512,7 +29382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -31530,7 +29400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_SSE2",
@@ -31548,7 +29418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -31572,7 +29442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -31596,7 +29466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_SSE2",
@@ -31620,7 +29490,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -31644,7 +29514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -31668,7 +29538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -31692,7 +29562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -31716,7 +29586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -31740,7 +29610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -31764,7 +29634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_SSSE3",
@@ -31788,7 +29658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -31812,7 +29682,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -31833,7 +29703,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -31869,46 +29739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScalePlaneDown2_16To8",
-   "linker_set_key" : "ScalePlaneDown2_16To8",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -31953,7 +29784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -31998,7 +29829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -32046,7 +29877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -32082,7 +29913,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -32118,55 +29949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -32187,7 +29970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_AVX2",
@@ -32208,7 +29991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_AVX2",
@@ -32229,7 +30012,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_SSSE3",
@@ -32250,7 +30033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -32271,7 +30054,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_AVX2",
@@ -32292,7 +30075,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -32313,7 +30096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_SSSE3",
@@ -32334,7 +30117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_SSSE3",
@@ -32355,55 +30138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -32424,7 +30159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_AVX2",
@@ -32445,7 +30180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_AVX2",
@@ -32466,7 +30201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_SSSE3",
@@ -32487,7 +30222,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -32508,7 +30243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_SSSE3",
@@ -32529,55 +30264,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -32598,7 +30285,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_AVX2",
@@ -32619,7 +30306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_AVX2",
@@ -32640,7 +30327,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_SSSE3",
@@ -32661,7 +30348,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -32682,7 +30369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_SSSE3",
@@ -32703,7 +30390,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -32724,7 +30411,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_SSSE3",
@@ -32745,7 +30432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -32766,7 +30453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_SSSE3",
@@ -32787,7 +30474,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -32808,7 +30495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -32829,7 +30516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_SSSE3",
@@ -32850,7 +30537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -32871,7 +30558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_SSSE3",
@@ -32892,7 +30579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_SSSE3",
@@ -32913,7 +30600,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -32934,7 +30621,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_SSSE3",
@@ -32955,7 +30642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -32976,7 +30663,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -32997,7 +30684,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_SSSE3",
@@ -33018,7 +30705,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -33039,7 +30726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_SSSE3",
@@ -33060,7 +30747,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -33081,7 +30768,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_SSSE3",
@@ -33102,7 +30789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -33123,7 +30810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_SSSE3",
@@ -33144,7 +30831,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_SSSE3",
@@ -33165,7 +30852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -33186,7 +30873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_SSSE3",
@@ -33207,7 +30894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -33228,7 +30915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_AVX2",
@@ -33249,7 +30936,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_AVX2",
@@ -33270,7 +30957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_SSSE3",
@@ -33291,7 +30978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -33312,7 +30999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_SSSE3",
@@ -33333,7 +31020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -33354,7 +31041,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_AVX2",
@@ -33375,7 +31062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_AVX2",
@@ -33396,7 +31083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_SSSE3",
@@ -33417,7 +31104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -33438,7 +31125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_SSSE3",
@@ -33459,7 +31146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_AVX2",
@@ -33483,7 +31170,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_AVX2",
@@ -33507,7 +31194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_SSSE3",
@@ -33531,7 +31218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_SSSE3",
@@ -33555,7 +31242,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_AVX2",
@@ -33579,7 +31266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_AVX2",
@@ -33603,7 +31290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -33627,7 +31314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_SSE2",
@@ -33651,7 +31338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -33675,7 +31362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_SSE2",
@@ -33699,7 +31386,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_AVX2",
@@ -33723,7 +31410,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_AVX2",
@@ -33747,7 +31434,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -33771,7 +31458,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSE2",
@@ -33795,7 +31482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSSE3",
@@ -33819,7 +31506,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -33843,7 +31530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSE2",
@@ -33867,7 +31554,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSSE3",
@@ -33891,7 +31578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_AVX2",
@@ -33909,7 +31596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_AVX2",
@@ -33927,7 +31614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_SSSE3",
@@ -33945,7 +31632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_SSSE3",
@@ -33963,7 +31650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_AVX2",
@@ -33981,7 +31668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_AVX2",
@@ -33999,7 +31686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -34017,7 +31704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_SSE2",
@@ -34035,7 +31722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -34053,7 +31740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_SSE2",
@@ -34071,7 +31758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_AVX2",
@@ -34089,7 +31776,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_AVX2",
@@ -34107,7 +31794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -34125,7 +31812,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSE2",
@@ -34143,7 +31830,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSSE3",
@@ -34161,7 +31848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -34179,7 +31866,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSE2",
@@ -34197,7 +31884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSSE3",
@@ -34215,7 +31902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -34236,7 +31923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -34272,7 +31959,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -34293,7 +31980,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -34317,7 +32004,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -34341,7 +32028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -34365,7 +32052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -34389,7 +32076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -34413,7 +32100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_AVX2",
@@ -34434,7 +32121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_AVX2",
@@ -34455,7 +32142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_SSSE3",
@@ -34476,7 +32163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -34497,7 +32184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_SSSE3",
@@ -34518,7 +32205,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -34539,7 +32226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -34560,7 +32247,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -34584,7 +32271,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -34608,7 +32295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_AVX2",
@@ -34632,7 +32319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_AVX2",
@@ -34656,7 +32343,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -34680,7 +32367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_SSE41",
@@ -34704,7 +32391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -34728,7 +32415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_SSE41",
@@ -34752,7 +32439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_AVX2",
@@ -34776,7 +32463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_AVX2",
@@ -34800,7 +32487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -34824,7 +32511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_SSSE3",
@@ -34848,7 +32535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -34872,7 +32559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_SSSE3",
@@ -34896,7 +32583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_AVX2",
@@ -34914,7 +32601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_AVX2",
@@ -34932,7 +32619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -34950,7 +32637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_SSE41",
@@ -34968,7 +32655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -34986,7 +32673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_SSE41",
@@ -35004,7 +32691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_AVX2",
@@ -35022,7 +32709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_AVX2",
@@ -35040,7 +32727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -35058,7 +32745,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_SSSE3",
@@ -35076,7 +32763,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -35094,7 +32781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_SSSE3",
@@ -35112,7 +32799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -35136,7 +32823,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_X86",
@@ -35154,7 +32841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -35172,7 +32859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_ERMS",
@@ -35190,7 +32877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_X86",
@@ -35208,7 +32895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_SSE2",
@@ -35229,7 +32916,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -35250,7 +32937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_SSE2",
@@ -35271,7 +32958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_SSE2",
@@ -35292,7 +32979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -35313,7 +33000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_SSE2",
@@ -35334,7 +33021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -35358,7 +33045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_SSE2",
@@ -35382,7 +33069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_SSE2",
@@ -35403,7 +33090,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -35424,7 +33111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_SSE2",
@@ -35445,7 +33132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -35466,7 +33153,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_SSE2",
@@ -35487,7 +33174,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -35532,7 +33219,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_AVX2",
@@ -35559,7 +33246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_AVX2",
@@ -35586,7 +33273,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSE2",
@@ -35613,7 +33300,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSSE3",
@@ -35640,7 +33327,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -35667,7 +33354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSE2",
@@ -35694,7 +33381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSSE3",
@@ -35721,7 +33408,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -35760,7 +33447,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_SSSE3",
@@ -35784,7 +33471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -35808,7 +33495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_SSSE3",
@@ -35832,7 +33519,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -35868,7 +33555,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -35901,7 +33588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -35934,7 +33621,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -35967,7 +33654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -36000,7 +33687,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -36033,7 +33720,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -36069,7 +33756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_AVX2",
@@ -36093,7 +33780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_AVX2",
@@ -36117,7 +33804,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -36141,7 +33828,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_AVX2",
@@ -36162,7 +33849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_AVX2",
@@ -36183,7 +33870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_SSE2",
@@ -36204,7 +33891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -36225,7 +33912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_SSE2",
@@ -36246,7 +33933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_AVX2",
@@ -36270,7 +33957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_AVX2",
@@ -36294,7 +33981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSE2",
@@ -36318,7 +34005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSSE3",
@@ -36342,7 +34029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -36366,7 +34053,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSE2",
@@ -36390,7 +34077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSSE3",
@@ -36414,7 +34101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -36429,7 +34116,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -36447,7 +34134,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_SSE2",
@@ -36465,7 +34152,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -36492,7 +34179,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_AVX2",
@@ -36510,7 +34197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_AVX2",
@@ -36528,7 +34215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_SSSE3",
@@ -36546,7 +34233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -36564,7 +34251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_SSSE3",
@@ -36582,79 +34269,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -36681,7 +34296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_SSE2",
@@ -36711,7 +34326,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -36741,7 +34356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_SSE2",
@@ -36771,7 +34386,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -36804,31 +34419,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWx8_16_C",
-   "linker_set_key" : "TransposeWx8_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_SSSE3",
@@ -36852,7 +34443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -36876,7 +34467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Fast_Any_SSSE3",
@@ -36900,7 +34491,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Fast_SSSE3",
@@ -36924,7 +34515,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_SSSE3",
@@ -36948,34 +34539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWxH_16_C",
-   "linker_set_key" : "TransposeWxH_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -37002,7 +34566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -37041,7 +34605,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -37080,7 +34644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -37119,7 +34683,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -37158,7 +34722,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -37197,7 +34761,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -37236,7 +34800,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -37275,7 +34839,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -37314,7 +34878,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -37353,7 +34917,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -37392,7 +34956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -37431,7 +34995,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -37470,7 +35034,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -37509,7 +35073,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -37548,7 +35112,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -37575,7 +35139,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_AVX2",
@@ -37596,7 +35160,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_AVX2",
@@ -37617,7 +35181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_SSSE3",
@@ -37638,7 +35202,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -37659,7 +35223,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_SSSE3",
@@ -37680,7 +35244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -37719,7 +35283,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -37758,7 +35322,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -37791,7 +35355,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_AVX2",
@@ -37812,7 +35376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_AVX2",
@@ -37833,7 +35397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_SSE2",
@@ -37854,7 +35418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -37875,7 +35439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_SSE2",
@@ -37896,7 +35460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_AVX2",
@@ -37920,7 +35484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_AVX2",
@@ -37944,7 +35508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_SSE2",
@@ -37968,7 +35532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -37992,7 +35556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_SSE2",
@@ -38016,7 +35580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -38043,7 +35607,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_AVX2",
@@ -38061,7 +35625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_AVX2",
@@ -38079,7 +35643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_SSE2",
@@ -38097,7 +35661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -38115,7 +35679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_SSE2",
@@ -38133,25 +35697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_C",
-   "linker_set_key" : "UnpackMT2T_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -38166,7 +35712,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -38193,7 +35739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_AVX2",
@@ -38214,7 +35760,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_AVX2",
@@ -38235,7 +35781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_SSSE3",
@@ -38256,7 +35802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -38277,7 +35823,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_SSSE3",
@@ -38298,7 +35844,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -38337,7 +35883,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -38376,7 +35922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -38409,112 +35955,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_AVX2",
@@ -38535,7 +35976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_AVX2",
@@ -38556,7 +35997,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_SSE2",
@@ -38577,7 +36018,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -38598,7 +36039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_SSE2",
@@ -38619,7 +36060,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_AVX2",
@@ -38643,7 +36084,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_AVX2",
@@ -38667,7 +36108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_SSE2",
@@ -38691,7 +36132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -38715,7 +36156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_SSE2",
@@ -38739,7 +36180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -38766,7 +36207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_AVX2",
@@ -38784,7 +36225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_AVX2",
@@ -38802,7 +36243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_SSE2",
@@ -38820,7 +36261,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -38838,7 +36279,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_SSE2",
@@ -38856,7 +36297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -38870,7 +36311,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -38883,7 +36324,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38897,7 +36338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -38910,7 +36351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -38932,7 +36373,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -38957,7 +36398,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -38973,7 +36414,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -38986,7 +36427,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -39002,7 +36443,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -39018,7 +36459,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -39035,7 +36476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -39051,7 +36492,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -39067,7 +36508,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -39083,7 +36524,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -39100,7 +36541,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -39114,7 +36555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -39130,7 +36571,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -39146,7 +36587,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -39164,7 +36605,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -39177,7 +36618,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -39193,7 +36634,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -39206,7 +36647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -39219,7 +36660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -39238,7 +36679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -39251,7 +36692,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -39264,7 +36705,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -39277,7 +36718,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -39290,7 +36731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -39299,121 +36740,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -39426,7 +36867,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39435,7 +36876,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39444,7 +36885,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -39453,7 +36894,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39462,7 +36903,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -39471,7 +36912,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39480,7 +36921,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -39489,7 +36930,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 8,
@@ -39498,7 +36939,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -39507,7 +36948,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 8,
@@ -39516,16 +36957,7 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKj",
-   "name" : "const unsigned int *",
-   "referenced_type" : "_ZTIKj",
-   "self_type" : "_ZTIPKj",
-   "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39534,7 +36966,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -39543,7 +36975,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39552,7 +36984,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39561,7 +36993,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39570,7 +37002,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39579,7 +37011,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39588,7 +37020,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -39597,7 +37029,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -39606,7 +37038,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39615,7 +37047,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "alignment" : 8,
@@ -39624,7 +37056,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -39633,7 +37065,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -39646,7 +37078,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 2,
@@ -39656,7 +37088,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -39666,7 +37098,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -39676,7 +37108,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -39686,7 +37118,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -39696,7 +37128,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -39706,7 +37138,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39716,7 +37148,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39726,7 +37158,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -39736,7 +37168,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -39765,7 +37197,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 16,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -39843,7 +37275,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 96,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -39879,7 +37311,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 8,
@@ -39900,7 +37332,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 16,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/34/64/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 64469f70..2f66bb22 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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2936,7 +2936,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "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" : 4278190080,
+     "enum_field_value" : -16777216,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/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 4296c992..a175cf41 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : -281474976710656,
+     "enum_field_value" : 0,
      "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 ec8f536e..c2e730a2 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 dba61206..a0f53a83 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4275,11 +4275,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4860,11 +4860,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 06ddcd07..a7ed66a4 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" : 4294967296,
+     "enum_field_value" : 0,
      "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" : -281474976710656,
+     "enum_field_value" : 0,
      "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 4f69495e..9a047be3 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 7a827caf..ebc16fbd 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3447,11 +3447,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 7a13db94..441ecba8 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3464,11 +3464,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4049,11 +4049,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 274d7837..d847e0f4 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 c0a2f08a..96f7e6d5 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3819,11 +3819,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 e8146f3f..508d1c82 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3857,11 +3857,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4442,11 +4442,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 1f47e56b..04cfa8b0 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3953,11 +3953,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4538,11 +4538,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/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 03b99193..cc3453e5 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 dd8eb56b..2e11995e 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/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 328ef876..da8c2d28 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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : 3273654271,
+     "enum_field_value" : -1021313025,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3687,7 +3687,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "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" : 4278190080,
+     "enum_field_value" : -16777216,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/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 e166f988..552de386 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,31 +963,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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"
     },
@@ -17928,7 +17903,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17937,7 +17912,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17952,7 +17927,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -17961,7 +17936,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17976,7 +17951,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17985,7 +17960,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -18000,7 +17975,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -18009,7 +17984,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -38212,7 +38187,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -42776,7 +42751,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -42816,7 +42791,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -42826,7 +42801,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -42836,7 +42811,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -43632,7 +43607,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -43641,7 +43616,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/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 527ce30e..6a8925ab 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,12 +5945,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump b/34/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump
index 6e17ec14..9e0936b4 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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -313,7 +313,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -673,7 +673,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7058,7 +7058,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7340,31 +7340,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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"
     },
@@ -10996,7 +10971,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11014,7 +10989,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11047,7 +11022,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11062,7 +11037,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11080,7 +11055,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11098,7 +11073,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11125,7 +11100,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11161,7 +11136,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11179,7 +11154,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11200,7 +11175,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11224,7 +11199,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11260,7 +11235,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11299,7 +11274,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11335,7 +11310,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11374,7 +11349,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11407,7 +11382,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11425,7 +11400,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11542,7 +11517,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11563,7 +11538,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23665,7 +23640,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23674,7 +23649,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23728,7 +23703,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23746,7 +23721,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23854,7 +23829,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23863,7 +23838,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24214,7 +24189,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24223,7 +24198,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24232,7 +24207,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24241,7 +24216,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24250,7 +24225,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24259,7 +24234,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24268,7 +24243,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24286,7 +24261,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24295,7 +24270,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24304,7 +24279,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24313,7 +24288,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24322,7 +24297,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24331,7 +24306,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24340,7 +24315,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24349,7 +24324,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24358,7 +24333,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24367,7 +24342,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24430,7 +24405,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24439,7 +24414,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24997,7 +24972,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25042,7 +25017,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -25051,7 +25026,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25201,8 +25176,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript12ScriptGroup2E",
    "name" : "const android::renderscript::ScriptGroup2 *",
-   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25651,8 +25626,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript7ClosureE",
    "name" : "const android::renderscript::Closure *",
-   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -31648,7 +31623,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -31702,7 +31677,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -32418,7 +32393,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -32468,7 +32443,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -32478,7 +32453,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36121,7 +36096,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/e560d7b19ebf7276b3e850d3d346dec8/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/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -37618,7 +37593,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37674,7 +37649,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -38525,7 +38500,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -38861,7 +38836,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -39401,7 +39376,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -39614,7 +39589,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -47975,7 +47950,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48056,7 +48031,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -48831,7 +48806,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -48848,7 +48823,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48858,7 +48833,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -48875,7 +48850,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -57994,7 +57969,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -58003,7 +57978,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58018,7 +57993,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58027,7 +58002,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58042,7 +58017,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -58051,7 +58026,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58066,7 +58041,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58075,7 +58050,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -129482,7 +129457,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -129491,7 +129466,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -129509,7 +129484,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2>",
+   "name" : "std::__make_tuple_indices<2, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -151136,7 +151111,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -151176,7 +151151,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -151186,7 +151161,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -151196,7 +151171,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -151299,7 +151274,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151413,7 +151388,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151527,7 +151502,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151626,7 +151601,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -152445,7 +152420,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -152454,7 +152429,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/x86_x86_64/source-based/libRSDriver.so.lsdump b/34/64/x86_x86_64/source-based/libRSDriver.so.lsdump
index beec0536..b6354d6f 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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6262,31 +6262,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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"
     },
@@ -10629,7 +10604,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10653,7 +10628,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11340,7 +11315,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -26503,8 +26478,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -32449,7 +32424,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -69484,7 +69459,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
diff --git a/34/64/x86_x86_64/source-based/libRS_internal.so.lsdump b/34/64/x86_x86_64/source-based/libRS_internal.so.lsdump
index b127a5dc..dff4ac34 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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8574,31 +8574,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4294967295,
-     "name" : "BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967294,
-     "name" : "BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE"
-    },
-    {
-     "enum_field_value" : 4294967293,
-     "name" : "BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED"
-    }
-   ],
-   "linker_set_key" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "name" : "(unnamed)",
-   "referenced_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "self_type" : "_ZTI41$BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE",
-   "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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"
     },
@@ -31977,7 +31952,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "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" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37806,8 +37781,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/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",
+   "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",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -38049,8 +38024,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38058,8 +38033,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38067,8 +38042,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38076,8 +38051,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -74491,7 +74466,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74500,7 +74475,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74515,7 +74490,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74524,7 +74499,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74539,7 +74514,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74548,7 +74523,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74563,7 +74538,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74572,7 +74547,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126026,7 +126001,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139514,7 +139489,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -139657,7 +139632,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147211,7 +147186,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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -156536,7 +156511,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -156576,7 +156551,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -156586,7 +156561,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -156596,7 +156571,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -157354,7 +157329,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -157363,7 +157338,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
diff --git a/34/64/x86_x86_64/source-based/libaudioutils.so.lsdump b/34/64/x86_x86_64/source-based/libaudioutils.so.lsdump
index e4788ee2..b6cb4355 100644
--- a/34/64/x86_x86_64/source-based/libaudioutils.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libaudioutils.so.lsdump
@@ -1740,14 +1740,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE25__emplace_unique_key_argsIjJRKNS_4pairIKjS6_EEEEENSK_INS_15__hash_iteratorIPNS_11__hash_nodeIS7_PvEEEEbEERKT_DpOT0_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjPKNS_5arrayINS2_IfLj5EEELj3EEEEENS_22__unordered_map_hasherIjS7_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS7_NS_8equal_toIjEELb1EEENS_9allocatorIS7_EEE8__rehashEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__112basic_stringIhNS_11char_traitsIhEENS_9allocatorIhEEE21__grow_by_and_replaceEjjjjjjPKh"
   },
   {
@@ -2935,7 +2927,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : 4294967295,
+     "enum_field_value" : -1,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3173,119 +3165,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : 2147483650,
+     "enum_field_value" : -2147483646,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : 2147483652,
+     "enum_field_value" : -2147483644,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : 2147483664,
+     "enum_field_value" : -2147483632,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : 2147483776,
+     "enum_field_value" : -2147483520,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : 2147483904,
+     "enum_field_value" : -2147483392,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : 2147484160,
+     "enum_field_value" : -2147483136,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147484672,
+     "enum_field_value" : -2147482624,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : 2147485696,
+     "enum_field_value" : -2147481600,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : 2147487744,
+     "enum_field_value" : -2147479552,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : 2147491840,
+     "enum_field_value" : -2147475456,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : 2147500032,
+     "enum_field_value" : -2147467264,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : 2147516416,
+     "enum_field_value" : -2147450880,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : 2147549184,
+     "enum_field_value" : -2147418112,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : 2147614720,
+     "enum_field_value" : -2147352576,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : 2147745792,
+     "enum_field_value" : -2147221504,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : 2148007936,
+     "enum_field_value" : -2146959360,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : 2148532224,
+     "enum_field_value" : -2146435072,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : 2164260864,
+     "enum_field_value" : -2130706432,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : 2181038080,
+     "enum_field_value" : -2113929216,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : 2214592512,
+     "enum_field_value" : -2080374784,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : 2281701376,
+     "enum_field_value" : -2013265920,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : 2281701377,
+     "enum_field_value" : -2013265919,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : 2415919104,
+     "enum_field_value" : -1879048192,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : 2684354560,
+     "enum_field_value" : -1610612736,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3297,15 +3289,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : 2147483712,
+     "enum_field_value" : -2147483584,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : 2147483680,
+     "enum_field_value" : -2147483616,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4108,15 +4100,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : 3743416319,
+     "enum_field_value" : -551550977,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : 2147483656,
+     "enum_field_value" : -2147483640,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : 2181044224,
+     "enum_field_value" : -2113923072,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4598,99 +4590,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : 2147483649,
+     "enum_field_value" : -2147483647,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : 2147483651,
+     "enum_field_value" : -2147483645,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : 2147483655,
+     "enum_field_value" : -2147483641,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : 2147483663,
+     "enum_field_value" : -2147483633,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : 2147483679,
+     "enum_field_value" : -2147483617,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : 2147483711,
+     "enum_field_value" : -2147483585,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : 2147483775,
+     "enum_field_value" : -2147483521,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : 2147483903,
+     "enum_field_value" : -2147483393,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : 2147484159,
+     "enum_field_value" : -2147483137,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : 2147484671,
+     "enum_field_value" : -2147482625,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : 2147485695,
+     "enum_field_value" : -2147481601,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : 2147487743,
+     "enum_field_value" : -2147479553,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : 2147491839,
+     "enum_field_value" : -2147475457,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : 2147500031,
+     "enum_field_value" : -2147467265,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : 2147516415,
+     "enum_field_value" : -2147450881,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : 2147549183,
+     "enum_field_value" : -2147418113,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : 2147614719,
+     "enum_field_value" : -2147352577,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : 2147745791,
+     "enum_field_value" : -2147221505,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : 2148007935,
+     "enum_field_value" : -2146959361,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : 2148532223,
+     "enum_field_value" : -2146435073,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : 2149580799,
+     "enum_field_value" : -2145386497,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : 2151677951,
+     "enum_field_value" : -2143289345,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : 2155872255,
+     "enum_field_value" : -2139095041,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : 2164260863,
+     "enum_field_value" : -2130706433,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4706,7 +4698,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5428,7 +5420,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5503,7 +5495,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5524,7 +5516,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4278190080,
+     "enum_field_value" : -16777216,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -12220,7 +12212,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -13985,7 +13977,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -19135,7 +19127,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/x86_x86_64/source-based/libbase.so.lsdump b/34/64/x86_x86_64/source-based/libbase.so.lsdump
index d6f7d7c4..2029f6b2 100644
--- a/34/64/x86_x86_64/source-based/libbase.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libbase.so.lsdump
@@ -1074,21 +1074,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -1925,7 +1916,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1976,7 +1967,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2732,7 +2723,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2766,7 +2757,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4915,23 +4906,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -4950,22 +4924,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -4982,22 +4940,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
diff --git a/34/64/x86_x86_64/source-based/libbinder.so.lsdump b/34/64/x86_x86_64/source-based/libbinder.so.lsdump
index ea65ecd8..0a3a917e 100644
--- a/34/64/x86_x86_64/source-based/libbinder.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libbinder.so.lsdump
@@ -73,15 +73,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA1_Ds",
-   "name" : "char16_t[1]",
-   "referenced_type" : "_ZTIDs",
-   "self_type" : "_ZTIA1_Ds",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 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]",
@@ -100,6 +91,15 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "linker_set_key" : "_ZTIA20_Ds",
+   "name" : "char16_t[20]",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIA20_Ds",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA20_y",
    "name" : "unsigned long long[20]",
@@ -1064,6 +1064,34 @@
    "name" : "_ZN7android10zeroMemoryEPhj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv"
+  },
+  {
    "name" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE"
   },
   {
@@ -1835,6 +1863,214 @@
    "name" : "_ZN7android2os20ParcelFileDescriptorD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7BBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9HeapCacheEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_9RpcServerEEaSEOS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_7IBinderEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_"
+  },
+  {
    "name" : "_ZN7android33makeDefaultRpcTransportCtxFactoryEv"
   },
   {
@@ -1919,21 +2155,12 @@
    "name" : "_ZN7android4base13StringReplaceENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEES5_S5_b"
   },
   {
-   "name" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedProperty3GetEPb"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC1EPKc"
   },
   {
-   "name" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZN7android4base14CachedPropertyC2EPKc"
   },
   {
@@ -2099,6 +2326,22 @@
    "name" : "_ZN7android4base8EndsWithENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEc"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_"
+  },
+  {
    "name" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_"
   },
   {
@@ -2114,6 +2357,22 @@
    "name" : "_ZN7android4base9ParseBoolENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
+  },
+  {
    "name" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj"
   },
   {
@@ -2165,6 +2424,14 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
+  },
+  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2303,9 +2570,6 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
-   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
-  },
-  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2513,9 +2777,6 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
-   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
-  },
-  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3053,9 +3314,6 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
-   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
-  },
-  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3266,10 +3524,7 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
-  },
-  {
-   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3587,6 +3842,22 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
+  },
+  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3716,9 +3987,6 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
-   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
-  },
-  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3737,6 +4005,14 @@
    "name" : "_ZNK7android6Parcel16readStrongBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -3920,6 +4196,198 @@
    "name" : "_ZNK7android6Parcel9readInt64Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+  },
+  {
    "name" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE"
   },
   {
@@ -4026,10 +4494,406 @@
   },
   {
    "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_"
   },
   {
@@ -4038,9 +4902,1329 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE8overflowEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9pbackfailEi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9underflowEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb0EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__116__copy_unalignedINS_6vectorIbNS_9allocatorIbEEEELb1EEENS_14__bit_iteratorIT_Lb0ELi0EEENS5_IS6_XT0_ELi0EEES8_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android6binder8internal21ClientCounterCallbackENS_9allocatorIS4_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS1_2os17PersistableBundleENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S4_EEEEEixERS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIS2_NS_9allocatorIS2_EEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEENS_4lessIS2_EENS4_INS_4pairIKS2_S6_EEEEEixERSA_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ES2_NS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S2_EEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EbNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_bEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EdNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_dEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16EiNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_iEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android8String16ExNS_4lessIS2_EENS_9allocatorINS_4pairIKS2_xEEEEEixERS7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_11__thread_idENS_6threadENS_4lessIS1_EENS_9allocatorINS_4pairIKS1_S2_EEEEEixEOS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceENS_4lessIS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINS9_15IServiceManager25LocalRegistrationCallbackEEENSA_INS9_18ServiceManagerShim18RegistrationWaiterEEEEENS4_ISH_EEEENS_4lessIS6_EENS4_INS8_IKS6_SJ_EEEEEixERSM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIPKvN7android8BpBinder13ObjectManager7entry_tENS_4lessIS2_EENS_9allocatorINS_4pairIKS2_S6_EEEEEixERSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE14__erase_uniqueIS5_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__construct_nodeIJRS5_EEENS_10unique_ptrINS_11__tree_nodeIS5_PvEENS_22__tree_node_destructorINS8_ISG_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSF_SF_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE25__emplace_unique_key_argsIS5_JRS5_EEENS_4pairINS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android2spINS1_7BBinder13RpcServerLinkEEENS_4lessIS5_EENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE12__find_equalIS2_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISC_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSC_SC_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIN7android8String16ENS_4lessIS2_EENS_9allocatorIS2_EEE25__emplace_unique_key_argsIS2_JRKS2_EEENS_4pairINS_15__tree_iteratorIS2_PNS_11__tree_nodeIS2_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISK_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS5_JNS_4pairIKS5_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE4findIS5_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_7IBinderEEENS2_9HeapCache11heap_info_tEEENS_19__map_value_compareIS5_S8_NS_4lessIS5_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_SG_EEiEERPNS_15__tree_end_nodeISI_EESJ_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISI_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__assign_multiINS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEEEvT_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE15__emplace_multiIJRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISQ_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__construct_nodeIJRKNS_4pairIKS3_S5_EEEEENS_10unique_ptrINS_11__tree_nodeIS6_PvEENS_22__tree_node_destructorINSB_ISN_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSI_SI_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSI_IJEEEEEENS_4pairINS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S5_EEEEENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEENS_21__tree_const_iteratorIS6_SO_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE4findIS3_EENS_15__tree_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE5eraseENS_21__tree_const_iteratorIS6_PNS_11__tree_nodeIS6_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE7destroyEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS2_2os17PersistableBundleEEENS_19__map_value_compareIS3_S6_NS_4lessIS3_EELb1EEENS_9allocatorIS6_EEE8__detachEPNS_11__tree_nodeIS6_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIS3_NS_9allocatorIS3_EEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIbNS_9allocatorIbEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIdNS_9allocatorIdEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIiNS_9allocatorIiEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_SH_EEiEERPNS_15__tree_end_nodeISJ_EESK_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISJ_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__assign_multiINS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEEEvT_SM_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE15__emplace_multiIJRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__construct_nodeIJRKNS_4pairIKS3_S7_EEEEENS_10unique_ptrINS_11__tree_nodeIS8_PvEENS_22__tree_node_destructorINS5_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSJ_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSJ_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S7_EEEEENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEENS_21__tree_const_iteratorIS8_SP_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE5eraseENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE8__detachEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISO_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__construct_nodeIJRKNS_4pairIKS3_S3_EEEEENS_10unique_ptrINS_11__tree_nodeIS4_PvEENS_22__tree_node_destructorINS9_ISL_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_S3_EEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_bEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EbEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_dEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EdEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_iEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16EiEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_SE_EEiEERPNS_15__tree_end_nodeISG_EESH_RKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE12__find_equalIS3_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISG_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__assign_multiINS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEEEvT_SJ_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE14__erase_uniqueIS3_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE15__emplace_multiIJRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__find_leaf_highERPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE30__emplace_hint_unique_key_argsIS3_JRKNS_4pairIKS3_xEEEEENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEENS_21__tree_const_iteratorIS4_SM_iEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE8__detachEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE13__move_assignERSB_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSG_SG_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE25__emplace_unique_key_argsIS2_JRKNS_21piecewise_construct_tENS_5tupleIJOS2_EEENSG_IJEEEEEENS_4pairINS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSO_SO_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISW_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSW_SW_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSW_IJEEEEEENS9_INS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE4findIS7_EENS_15__tree_iteratorISL_PNS_11__tree_nodeISL_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE5eraseENS_21__tree_const_iteratorISL_PNS_11__tree_nodeISL_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_6vectorINS_4pairIN7android2spINSA_15IServiceManager25LocalRegistrationCallbackEEENSB_INSA_18ServiceManagerShim18RegistrationWaiterEEEEENS5_ISI_EEEEEENS_19__map_value_compareIS7_SL_NS_4lessIS7_EELb1EEENS5_ISL_EEE7destroyEPNS_11__tree_nodeISL_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE12__find_equalIS5_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE13__lower_boundIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_SM_PNS_15__tree_end_nodeIPNS_16__tree_node_baseISK_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE25__emplace_unique_key_argsIS5_JRKNS_21piecewise_construct_tENS_5tupleIJRKS5_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE4findIS5_EENS_15__tree_iteratorISA_PNS_11__tree_nodeISA_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE5eraseENS_21__tree_const_iteratorISA_PNS_11__tree_nodeISA_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS6_10RpcSessionEEEEENS_19__map_value_compareIS5_SA_NS_4lessIS5_EELb1EEENS3_ISA_EEE7destroyEPNS_11__tree_nodeISA_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSK_SK_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JNS_4pairIKS3_S7_EEEEENSH_INS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE25__emplace_unique_key_argsIS3_JRKNS_21piecewise_construct_tENS_5tupleIJRKS3_EEENSK_IJEEEEEENS_4pairINS_15__tree_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKvN7android8BpBinder13ObjectManager7entry_tEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS_9allocatorIS8_EEE7destroyEPNS_11__tree_nodeIS8_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSH_SH_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE25__emplace_unique_key_argsIyJNS_4pairIKyS4_EEEEENSE_INS_15__tree_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__tree_const_iteratorIS5_PNS_11__tree_nodeIS5_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIyN7android8RpcState10BinderNodeEEENS_19__map_value_compareIyS5_NS_4lessIyEELb1EEENS_9allocatorIS5_EEE7destroyEPNS_11__tree_nodeIS5_PvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE24__emplace_back_slow_pathIJDsEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE26__swap_out_circular_bufferERNS_14__split_bufferIDsRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIDsNS_9allocatorIDsEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android15IServiceManager16ServiceDebugInfoENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRS3_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2os16ServiceDebugInfoENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSession13RpcConnectionEEENS_9allocatorIS5_EEE21__push_back_slow_pathIRKS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_10RpcSessionEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIRKS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_7IBinderEEENS_9allocatorIS4_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8RpcState10BinderNode9AsyncTodoENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6assignIPS2_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS2_NS_15iterator_traitsIS9_E9referenceEEE5valueEvE4typeES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8String16ENS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrIN7android8String16ENS_14default_deleteIS3_EEEENS_9allocatorIS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_10unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS7_EEEENS5_ISA_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIS6_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE21__push_back_slow_pathISA_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android2spINS2_15IServiceManager25LocalRegistrationCallbackEEENS3_INS2_18ServiceManagerShim18RegistrationWaiterEEEEENS_9allocatorISA_EEE26__swap_out_circular_bufferERNS_14__split_bufferISA_RSC_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE21__push_back_slow_pathIS8_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE24__emplace_back_slow_pathIJS6_EEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RSA_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_7variantIJN7android4base14unique_fd_implINS3_13DefaultCloserEEENS3_11borrowed_fdEEEENS_9allocatorIS8_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalIN7android8String16EEENS_9allocatorIS4_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEENS5_IS8_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE12__move_rangeEPS1_S5_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertENS_11__wrap_iterIPKS1_EEjRS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPKS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS9_E9referenceEEE5valueENS_11__wrap_iterIPS1_EEE4typeENSD_IS7_EES9_S9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorISt4byteNS_9allocatorIS1_EEE6insertIPS1_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS1_NS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIS6_EEE4typeENSC_IPKS1_EES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE26__swap_out_circular_bufferERNS_14__split_bufferIaRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIaNS_9allocatorIaEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEE9push_backERKb"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIbNS_9allocatorIbEEEaSERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE26__swap_out_circular_bufferERNS_14__split_bufferIdRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6assignIPdEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIdNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIdNS_9allocatorIdEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE26__swap_out_circular_bufferERNS_14__split_bufferIfRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIfNS_9allocatorIfEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIRKiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE21__push_back_slow_pathIiEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE26__swap_out_circular_bufferERNS_14__split_bufferIiRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6assignIPiEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE21__push_back_slow_pathIRKjEEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE26__swap_out_circular_bufferERNS_14__split_bufferIjRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIjNS_9allocatorIjEEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE26__swap_out_circular_bufferERNS_14__split_bufferIxRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6assignIPxEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIxNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIxNS_9allocatorIxEEEC2ERKS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE26__swap_out_circular_bufferERNS_14__split_bufferIyRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIyNS_9allocatorIyEEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__19__sift_upIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__1lsIcNS_11char_traitsIcEENS_9allocatorIcEEEERNS_13basic_ostreamIT_T0_EES9_RKNS_12basic_stringIS6_S7_T1_EE"
+  },
+  {
    "name" : "_ZThn4_N7android10AllocationD0Ev"
   },
   {
@@ -4302,9 +6486,15 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
+   "name" : "_ZN7android16kEnableRecordingE"
+  },
+  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
+   "name" : "_ZN7android20kEnableRpcDevServersE"
+  },
+  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -4741,6 +6931,10 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android10PoolThreadE"
+  },
+  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -4768,6 +6962,10 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android15BpShellCallbackE"
+  },
+  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -4777,6 +6975,14 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android16BpResultReceiverE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
+  },
+  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -4840,6 +7046,14 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -4908,10 +7122,6 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTVN7android15RpcTransportRawE"
-  },
-  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -4935,10 +7145,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTVN7android18RpcTransportCtxRawE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -6473,7 +8679,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -6524,7 +8730,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -10911,6 +13117,104 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/TextOutput.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemoryHeap>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_11IMemoryHeapEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IShellCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_14IShellCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IResultReceiver>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_15IResultReceiverEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IClientCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IClientCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceManager>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os15IServiceManagerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::os::IServiceCallback>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_2os16IServiceCallbackEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IMemory>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_7IMemoryEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android11BnInterfaceINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIPN7android7IBinderE",
+   "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
    "function_name" : "android::IMemoryHeap::asInterface",
    "linker_set_key" : "_ZN7android11IMemoryHeap11asInterfaceERKNS_2spINS_7IBinderEEE",
    "parameters" :
@@ -13396,6 +15700,849 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/ParcelFileDescriptor.h"
   },
   {
+   "function_name" : "android::sp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13EventListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::RpcConnection>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession13RpcConnectionEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession13RpcConnectionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession13RpcConnectionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession13RpcConnectionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession::WaitForShutdownListener>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSession23WaitForShutdownListenerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSession23WaitForShutdownListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcSession>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_10RpcSessionEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_10RpcSessionEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSessionEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_10RpcSessionEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_11IMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemoryHeap>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_11IMemoryHeapEEaSINS_12BpMemoryHeapEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_11IMemoryHeapEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12BpMemoryHeapEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_11IMemoryHeapEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android12BpMemoryHeapE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_12ProcessStateEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_12ProcessStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_12ProcessStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_12ProcessStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_14IShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IShellCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_14IShellCallbackEEaSINS_15BpShellCallbackEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14IShellCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15BpShellCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_14IShellCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android15BpShellCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IResultReceiver>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IResultReceiverEEaSINS_16BpResultReceiverEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IResultReceiverEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_16BpResultReceiverEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IResultReceiverEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android16BpResultReceiverE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager::LocalRegistrationCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManager25LocalRegistrationCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_15IServiceManagerEEaSINS_18ServiceManagerShimEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShimEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android18ServiceManagerShimE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::BufferedTextOutput::BufferState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18BufferedTextOutput11BufferStateEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18BufferedTextOutput11BufferStateEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18BufferedTextOutput11BufferStateEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::ServiceManagerShim::RegistrationWaiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_18ServiceManagerShim18RegistrationWaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IClientCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IClientCallbackEEaSINS1_16BpClientCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IClientCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os15IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os15IServiceManagerEEaSINS1_16BpServiceManagerEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16BpServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os15IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16BpServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::os::IServiceCallback>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_2os16IServiceCallbackEEaSINS1_17BpServiceCallbackEEERS3_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_2os17BpServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_2os16IServiceCallbackEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os17BpServiceCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::binder::internal::ClientCounterCallbackImpl>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6binder8internal25ClientCounterCallbackImplEEaSEOS4_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6binder8internal25ClientCounterCallbackImplEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6binder8internal25ClientCounterCallbackImplEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::BBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7BBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7BBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7BBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::clear",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IBinderEEaSINS_8BpBinderEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpBinderE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_7IMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_10AllocationEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_10AllocationEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android10AllocationE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::IMemory>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_7IMemoryEEaSINS_8BpMemoryEEERS2_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_7IMemoryEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8BpMemoryEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_7IMemoryEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android8BpMemoryE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::HeapCache>::~sp",
+   "linker_set_key" : "_ZN7android2spINS_9HeapCacheEED2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9HeapCacheEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::clear",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_9RpcServerEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_10RpcSession13EventListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcSession::EventListener>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_10RpcSession13EventListenerEEaSINS1_23WaitForShutdownListenerEEERS3_RKNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_10RpcSession13EventListenerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_10RpcSession23WaitForShutdownListenerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_10RpcSession13EventListenerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h",
+   "template_args" :
+   [
+    "_ZTIN7android10RpcSession23WaitForShutdownListenerE"
+   ]
+  },
+  {
+   "function_name" : "android::wp<android::IBinder::DeathRecipient>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinder14DeathRecipientEEaSERKS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinder14DeathRecipientEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinder14DeathRecipientEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinder14DeathRecipientEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_7IBinderEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_7IBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_7IBinderEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_7IBinderEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "function_name" : "android::wp<android::RpcServer>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_9RpcServerEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2wpINS_9RpcServerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2wpINS_9RpcServerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2wpINS_9RpcServerEEE",
+   "source_file" : "system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::base::LogMessage::stream",
    "linker_set_key" : "_ZN7android4base10LogMessage6streamEv",
    "parameters" :
@@ -13917,23 +17064,6 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
-   "function_name" : "android::base::CachedProperty::WaitForChange",
-   "linker_set_key" : "_ZN7android4base14CachedProperty13WaitForChangeENSt3__16chrono8durationIxNS2_5ratioILx1ELx1000EEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000EEEEE"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
    "function_name" : "android::base::CachedProperty::Get",
    "linker_set_key" : "_ZN7android4base14CachedProperty3GetEPb",
    "parameters" :
@@ -13952,22 +17082,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC1ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC1EPKc",
    "parameters" :
    [
@@ -13984,22 +17098,6 @@
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
-   "linker_set_key" : "_ZN7android4base14CachedPropertyC2ENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android4base14CachedPropertyE"
-    },
-    {
-     "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "system/libbase/include/android-base/properties.h"
-  },
-  {
-   "function_name" : "android::base::CachedProperty::CachedProperty",
    "linker_set_key" : "_ZN7android4base14CachedPropertyC2EPKc",
    "parameters" :
    [
@@ -14648,6 +17746,114 @@
    "source_file" : "system/libbase/include/android-base/strings.h"
   },
   {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIaEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIa"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIa"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIiEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIsEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIs"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIs"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseInt",
+   "linker_set_key" : "_ZN7android4base8ParseIntIxEEbPKcPT_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
    "function_name" : "android::base::Readlink",
    "linker_set_key" : "_ZN7android4base8ReadlinkERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPS7_",
    "parameters" :
@@ -14720,6 +17926,114 @@
    "source_file" : "system/libbase/include/android-base/parsebool.h"
   },
   {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIhEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIh"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIh"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIjEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIj"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintItEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIt"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIt"
+   ]
+  },
+  {
+   "function_name" : "android::base::ParseUint",
+   "linker_set_key" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/libbase/include/android-base/parseint.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::base::ReadFully",
    "linker_set_key" : "_ZN7android4base9ReadFullyENS0_11borrowed_fdEPvj",
    "parameters" :
@@ -15000,6 +18314,48 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIxEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIx"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIx"
+   ]
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::writeAligned",
+   "linker_set_key" : "_ZN7android6Parcel12writeAlignedIyEEiT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIy"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::writeCString",
    "linker_set_key" : "_ZN7android6Parcel12writeCStringEPKc",
    "parameters" :
@@ -15745,19 +19101,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::setServiceFuzzing",
-   "linker_set_key" : "_ZN7android6Parcel17setServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::writeDoubleVector",
    "linker_set_key" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -16865,12 +20208,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
   },
   {
-   "function_name" : "android::binder::LazyServiceRegistrar::createExtraTestInstance",
-   "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv",
-   "return_type" : "_ZTIN7android6binder20LazyServiceRegistrarE",
-   "source_file" : "frameworks/native/libs/binder/include/binder/LazyServiceRegistrar.h"
-  },
-  {
    "function_name" : "android::binder::LazyServiceRegistrar::setActiveServicesCallback",
    "linker_set_key" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE",
    "parameters" :
@@ -17665,7 +21002,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -17679,7 +21015,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
-   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -19480,7 +22815,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIb",
+   "return_type" : "_ZTIv",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -19626,7 +22961,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -19634,23 +22969,7 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "function_name" : "android::RpcServer::setServerSocketModifier",
-   "linker_set_key" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android9RpcServerE"
-    },
-    {
-     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -21566,19 +24885,6 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
-   "function_name" : "android::Parcel::isServiceFuzzing",
-   "linker_set_key" : "_ZNK7android6Parcel16isServiceFuzzingEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPKN7android6ParcelE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
    "function_name" : "android::Parcel::readDoubleVector",
    "linker_set_key" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -21669,6 +24975,46 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os15IClientCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os15IClientCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os15IClientCallbackE"
+   ]
+  },
+  {
+   "function_name" : "android::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel16readStrongBinderINS_2os16IServiceCallbackEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android2spINS_2os16IServiceCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" :
+   [
+    "_ZTIN7android2os16IServiceCallbackE"
+   ]
+  },
+  {
    "function_name" : "android::Parcel::readUint64Vector",
    "linker_set_key" : "_ZNK7android6Parcel16readUint64VectorEPNSt3__110unique_ptrINS1_6vectorIyNS1_9allocatorIyEEEENS1_14default_deleteIS6_EEEE",
    "parameters" :
@@ -22617,6 +25963,1062 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::ProcessState::handle_entry>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::BufferedTextOutput::BufferState>>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BpBinder::Obituary>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8BpBinder8ObituaryEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8BpBinder8ObituaryEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::String16>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_8String16EE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorINS_8String16EEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BBinder *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase::weakref_type *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::RefBase *>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<int>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPKN7android6VectorIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "function_name" : "android::binder::debug::RecordedTransaction::dumpToFile",
    "linker_set_key" : "_ZNK7android6binder5debug19RecordedTransaction10dumpToFileERKNS_4base14unique_fd_implINS3_13DefaultCloserEEE",
    "parameters" :
@@ -23447,10 +27849,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA1_KDs",
-   "name" : "const char16_t (&)[1]",
-   "referenced_type" : "_ZTIA1_KDs",
-   "self_type" : "_ZTIRA1_KDs",
+   "linker_set_key" : "_ZTIRA20_KDs",
+   "name" : "const char16_t (&)[20]",
+   "referenced_type" : "_ZTIA20_KDs",
+   "self_type" : "_ZTIRA20_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -23656,7 +28058,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_lto-thin/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
    "self_type" : "_ZTIRKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
@@ -24356,10 +28758,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -26368,8 +30770,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_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",
+   "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",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -29012,10 +33414,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -29696,15 +34098,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession> *",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIPN7android2wpINS_10RpcSessionEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android2wpINS_7BBinderEEE",
    "name" : "android::wp<android::BBinder> *",
    "referenced_type" : "_ZTIN7android2wpINS_7BBinderEEE",
@@ -30335,10 +34728,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -31171,16 +35564,6 @@
    "source_file" : "external/fmtlib/include/fmt/format-inl.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA1_KDs",
-   "name" : "const char16_t[1]",
-   "referenced_type" : "_ZTIA1_Ds",
-   "self_type" : "_ZTIA1_KDs",
-   "size" : 2,
-   "source_file" : "system/core/libutils/include/utils/String16.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA1_KPKc",
@@ -31191,6 +35574,16 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
+   "alignment" : 2,
+   "is_const" : true,
+   "linker_set_key" : "_ZTIA20_KDs",
+   "name" : "const char16_t[20]",
+   "referenced_type" : "_ZTIA20_Ds",
+   "self_type" : "_ZTIA20_KDs",
+   "size" : 40,
+   "source_file" : "system/core/libutils/include/utils/String16.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Ky",
@@ -33439,11 +37832,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "name" : "const android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "name" : "const android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -33563,7 +37956,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -34964,46 +39357,6 @@
      "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android15RpcTransportRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android15RpcTransportRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "name" : "libutilsinternal::is_complete_type<android::RpcTransportCtxRaw, void>",
-   "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "self_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android18RpcTransportCtxRawEvEE",
-   "size" : 1,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android18RpcTransportCtxRawE",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__117integral_constantIbLb1EEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
    "name" : "libutilsinternal::is_complete_type<android::Parcel, void>",
    "referenced_type" : "_ZTIN16libutilsinternal16is_complete_typeIN7android6ParcelEvEE",
@@ -46081,15 +50434,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
-   "name" : "android::StaticString16<1>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
+   "name" : "android::StaticString16<20>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
-   "size" : 12,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
+   "size" : 48,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -49560,7 +53913,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/e560d7b19ebf7276b3e850d3d346dec8/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/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -49610,34 +53963,6 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android10RpcSessionE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIPN7android7RefBase12weakref_typeE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "name" : "android::wp<android::RpcSession>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "self_type" : "_ZTIN7android2wpINS_10RpcSessionEEE",
-   "size" : 8,
-   "source_file" : "system/core/libutils/include/utils/RefBase.h",
-   "template_args" :
-   [
-    "_ZTIN7android10RpcSessionE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "_ZTIPN7android7BBinderE"
     },
     {
@@ -57120,12 +61445,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -59227,14 +63546,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA1_Ds"
+     "referenced_type" : "_ZTIA20_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "name" : "android::String16::StaticData<1>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
-   "size" : 8,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "name" : "android::String16::StaticData<20>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -59676,7 +63995,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -59686,32 +64005,26 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServerSocketModifier",
-     "field_offset" : 960,
-     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
-    },
-    {
-     "access" : "private",
      "field_name" : "mSessions",
-     "field_offset" : 1152,
+     "field_offset" : 960,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1248,
+     "field_offset" : 1056,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1280,
+     "field_offset" : 1088,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1344,
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -59720,12 +64033,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 200,
+   "size" : 176,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 192,
+     "component_value" : 168,
      "kind" : "vbase_offset"
     },
     {
@@ -59762,11 +64075,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -192,
+     "component_value" : -168,
      "kind" : "offset_to_top"
     },
     {
@@ -60913,10 +65226,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "name" : "std::function<sp<IBinder> (wp<RpcSession>, const void *, unsigned int)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
-   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE",
+   "linker_set_key" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "name" : "std::function<sp<IBinder> (const void *, unsigned int)> &&",
+   "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
+   "self_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -60949,15 +65262,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "name" : "std::function<void (borrowed_fd)> &&",
-   "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "self_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "name" : "std::function<void (LogId, LogSeverity, const char *, const char *, unsigned int, const char *)> &&",
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
diff --git a/34/64/x86_x86_64/source-based/libc++.so.lsdump b/34/64/x86_x86_64/source-based/libc++.so.lsdump
index 19ea3cb5..dcc4a65c 100644
--- a/34/64/x86_x86_64/source-based/libc++.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libc++.so.lsdump
@@ -2594,6 +2594,14 @@
    "name" : "_ZNSt3__112__next_primeEj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_"
+  },
+  {
    "name" : "_ZNSt3__112__rs_defaultC1ERKS0_"
   },
   {
@@ -4396,10 +4404,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_"
   },
   {
@@ -4415,6 +4447,22 @@
    "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIssEEPsEEvT0_S5_T_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_"
+  },
+  {
    "name" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE"
   },
   {
@@ -4590,6 +4638,10 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
+  },
+  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -4978,10 +5030,34 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_"
   },
   {
@@ -4998,10 +5074,50 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_"
   },
   {
@@ -5018,6 +5134,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_"
   },
   {
@@ -9794,7 +9926,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_grouping",
+   "function_name" : "std::moneypunct<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9808,7 +9940,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_neg_format",
+   "function_name" : "std::moneypunct<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9822,7 +9954,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_pos_format",
+   "function_name" : "std::moneypunct<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9836,7 +9968,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9850,7 +9982,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_frac_digits",
+   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9864,7 +9996,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_decimal_point",
+   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -9878,7 +10010,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_negative_sign",
+   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -9892,7 +10024,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_positive_sign",
+   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -9906,7 +10038,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10046,7 +10178,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10060,7 +10192,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10074,7 +10206,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10088,7 +10220,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10102,7 +10234,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10116,7 +10248,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10130,7 +10262,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10144,7 +10276,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10158,7 +10290,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13077,7 +13209,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13091,7 +13223,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13105,7 +13237,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13119,7 +13251,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13133,7 +13265,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13147,7 +13279,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13161,7 +13293,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13175,7 +13307,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13189,7 +13321,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13329,7 +13461,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13343,7 +13475,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13357,7 +13489,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13371,7 +13503,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13385,7 +13517,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13399,7 +13531,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13413,7 +13545,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13427,7 +13559,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13441,7 +13573,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20172,6 +20304,50 @@
    "source_file" : "external/libcxx/include/__hash_table"
   },
   {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPcEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPcEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPcEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPcEE"
+   ]
+  },
+  {
+   "function_name" : "std::__rotate_gcd",
+   "linker_set_key" : "_ZNSt3__112__rotate_gcdINS_11__wrap_iterIPwEEEET_S4_S4_S4_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__111__wrap_iterIPwEE"
+    }
+   ],
+   "return_type" : "_ZTINSt3__111__wrap_iterIPwEE",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTINSt3__111__wrap_iterIPwEE"
+   ]
+  },
+  {
    "function_name" : "std::__rs_default::__rs_default",
    "linker_set_key" : "_ZNSt3__112__rs_defaultC1ERKS0_",
    "parameters" :
@@ -28352,7 +28528,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char>::init",
+   "function_name" : "std::moneypunct_byname<char, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28386,7 +28562,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28420,6 +28596,121 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIaaEEPaEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIccEEPcEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIddEEPdEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIeeEEPeEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIffEEPfEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_",
    "parameters" :
    [
@@ -28443,6 +28734,29 @@
   },
   {
    "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIiiEEPiEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIjjEEPjEEvT0_S5_T_",
    "parameters" :
    [
@@ -28534,6 +28848,98 @@
    ]
   },
   {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIttEEPtEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIwwEEPwEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIxxEEPxEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__insertion_sort_3",
+   "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIyyEEPyEEvT0_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "access" : "private",
    "function_name" : "std::__time_get_storage<char>::init",
    "linker_set_key" : "_ZNSt3__118__time_get_storageIcE4initERKNS_5ctypeIcEE",
@@ -29345,6 +29751,19 @@
    "source_file" : "external/libcxx/include/memory"
   },
   {
+   "function_name" : "std::mersenne_twister_engine<unsigned int, 32, 624, 397, 31, 2567483615, 11, 4294967295, 7, 2636928640, 15, 4022730752, 18, 1812433253>::operator()",
+   "linker_set_key" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/random"
+  },
+  {
    "function_name" : "std::__libcpp_debug_exception::__libcpp_debug_exception",
    "linker_set_key" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE",
    "parameters" :
@@ -31385,6 +31804,136 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIaaEEPaEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIccEEPcEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIddEEPdEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIeeEEPeEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIffEEPfEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31411,6 +31960,32 @@
   },
   {
    "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIiiEEPiEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIjjEEPjEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31514,6 +32089,255 @@
    ]
   },
   {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIttEEPtEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIwwEEPwEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIxxEEPxEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort3",
+   "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIyyEEPyEEjT0_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIaaEEPaEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIPa"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIaaEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIaaEE",
+    "_ZTIPa"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIccEEPcEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIPc"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIccEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIccEE",
+    "_ZTIPc"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIddEEPdEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIPd"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIddEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIddEE",
+    "_ZTIPd"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIPe"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIeeEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIeeEE",
+    "_ZTIPe"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIffEEPfEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIffEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIffEE",
+    "_ZTIPf"
+   ]
+  },
+  {
    "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_",
    "parameters" :
@@ -31544,6 +32368,35 @@
   },
   {
    "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIiiEEPiEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIPi"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIiiEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIiiEE",
+    "_ZTIPi"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIjjEEPjEEjT0_S5_S5_S5_T_",
    "parameters" :
    [
@@ -31659,6 +32512,122 @@
    ]
   },
   {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIttEEPtEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIttEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIttEE",
+    "_ZTIPt"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIwwEEPwEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIPw"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIwwEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIwwEE",
+    "_ZTIPw"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIxxEEPxEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIPx"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIxxEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIxxEE",
+    "_ZTIPx"
+   ]
+  },
+  {
+   "function_name" : "std::__sort4",
+   "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIyyEEPyEEjT0_S5_S5_S5_T_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIPy"
+    },
+    {
+     "referenced_type" : "_ZTIRNSt3__16__lessIyyEE"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/libcxx/include/algorithm",
+   "template_args" :
+   [
+    "_ZTIRNSt3__16__lessIyyEE",
+    "_ZTIPy"
+   ]
+  },
+  {
    "function_name" : "std::__sort5",
    "linker_set_key" : "_ZNSt3__17__sort5IRNS_6__lessIeeEEPeEEjT0_S5_S5_S5_S5_T_",
    "parameters" :
@@ -34543,13 +35512,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char>::id",
+   "name" : "std::moneypunct<char, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char>::intl",
+   "name" : "std::moneypunct<char, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -34567,13 +35536,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t>::id",
+   "name" : "std::moneypunct<wchar_t, false>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t>::intl",
+   "name" : "std::moneypunct<wchar_t, false>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -54102,7 +55071,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54111,7 +55080,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54126,7 +55095,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54135,7 +55104,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
+   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54150,7 +55119,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -54159,7 +55128,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
+   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -54174,7 +55143,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -54183,7 +55152,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
+   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -114291,7 +115260,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0>",
+   "name" : "std::__make_tuple_indices<0, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -114300,7 +115269,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1>",
+   "name" : "std::__make_tuple_indices<1, 0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -134555,7 +135524,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000>",
+   "name" : "std::ratio<1000000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -134565,7 +135534,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000>",
+   "name" : "std::ratio<1000000, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -134605,7 +135574,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1>",
+   "name" : "std::ratio<1, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -134615,7 +135584,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600>",
+   "name" : "std::ratio<3600, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -134625,7 +135594,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60>",
+   "name" : "std::ratio<60, 1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -135737,7 +136706,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -135746,7 +136715,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135755,7 +136724,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
    "size" : 1,
@@ -135769,7 +136738,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135778,7 +136747,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135815,7 +136784,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135824,7 +136793,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135861,7 +136830,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135870,7 +136839,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135907,7 +136876,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135916,7 +136885,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135953,7 +136922,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -135962,7 +136931,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -135999,7 +136968,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000000ELb0EEE",
    "size" : 1,
@@ -136008,7 +136977,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136077,7 +137046,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1000000ELb0EEE",
    "size" : 1,
@@ -136086,7 +137055,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1000000EEEE13__no_overflowINS2_ILx1ELx1EEES3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136201,7 +137170,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
    "size" : 1,
@@ -136210,7 +137179,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
diff --git a/34/64/x86_x86_64/source-based/libcap.so.lsdump b/34/64/x86_x86_64/source-based/libcap.so.lsdump
index 0a44b6b8..2ccfa70f 100644
--- a/34/64/x86_x86_64/source-based/libcap.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcap.so.lsdump
@@ -49,6 +49,9 @@
  "elf_functions" :
  [
   {
+   "name" : "_libcap_strdup"
+  },
+  {
    "name" : "cap_clear"
   },
   {
@@ -76,9 +79,6 @@
    "name" : "cap_fill"
   },
   {
-   "name" : "cap_fill_flag"
-  },
-  {
    "name" : "cap_free"
   },
   {
@@ -121,21 +121,12 @@
    "name" : "cap_get_secbits"
   },
   {
-   "name" : "cap_iab_compare"
-  },
-  {
-   "name" : "cap_iab_dup"
-  },
-  {
    "name" : "cap_iab_fill"
   },
   {
    "name" : "cap_iab_from_text"
   },
   {
-   "name" : "cap_iab_get_pid"
-  },
-  {
    "name" : "cap_iab_get_proc"
   },
   {
@@ -193,9 +184,6 @@
    "name" : "cap_prctlw"
   },
   {
-   "name" : "cap_proc_root"
-  },
-  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -533,27 +521,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_fill_flag",
-   "linker_set_key" : "cap_fill_flag",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    },
-    {
-     "referenced_type" : "_ZTIP11_cap_struct"
-    },
-    {
-     "referenced_type" : "_ZTI10cap_flag_t"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_free",
    "linker_set_key" : "cap_free",
    "parameters" :
@@ -716,33 +683,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_compare",
-   "linker_set_key" : "cap_iab_compare",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    },
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
-   "function_name" : "cap_iab_dup",
-   "linker_set_key" : "cap_iab_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP9cap_iab_s"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_fill",
    "linker_set_key" : "cap_iab_fill",
    "parameters" :
@@ -776,18 +716,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_iab_get_pid",
-   "linker_set_key" : "cap_iab_get_pid",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIP9cap_iab_s",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_iab_get_proc",
    "linker_set_key" : "cap_iab_get_proc",
    "return_type" : "_ZTIP9cap_iab_s",
@@ -895,7 +823,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -910,7 +838,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -940,7 +868,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -961,7 +889,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -976,7 +904,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1070,18 +998,6 @@
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
-   "function_name" : "cap_proc_root",
-   "linker_set_key" : "cap_proc_root",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPc",
-   "source_file" : "external/libcap/libcap/include/sys/capability.h"
-  },
-  {
    "function_name" : "cap_reset_ambient",
    "linker_set_key" : "cap_reset_ambient",
    "return_type" : "_ZTIi",
diff --git a/34/64/x86_x86_64/source-based/libcodec2.so.lsdump b/34/64/x86_x86_64/source-based/libcodec2.so.lsdump
index 0c8f2c7f..567752be 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1268,7 +1268,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/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" : 18446744073709551600,
+     "enum_field_value" : -16,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3618,7 +3618,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3976,7 +3976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 3221225472,
+     "enum_field_value" : -1073741824,
      "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" : 3221225472,
+     "enum_field_value" : -1073741824,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4280,11 +4280,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6756,7 +6756,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6765,7 +6765,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6945,7 +6945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7017,7 +7017,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7224,7 +7224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7233,7 +7233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7242,7 +7242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7251,7 +7251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7260,7 +7260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7269,7 +7269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7278,7 +7278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7449,7 +7449,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7494,7 +7494,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7782,7 +7782,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7791,7 +7791,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7800,7 +7800,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -8165,7 +8165,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8225,7 +8225,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8275,7 +8275,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9020,7 +9020,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9076,7 +9076,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9560,7 +9560,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10028,7 +10028,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10620,7 +10620,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10987,7 +10987,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_x86_64/source-based/libcrypto.so.lsdump b/34/64/x86_x86_64/source-based/libcrypto.so.lsdump
index af8cea7c..074372b3 100644
--- a/34/64/x86_x86_64/source-based/libcrypto.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcrypto.so.lsdump
@@ -38,6 +38,15 @@
    "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]",
@@ -111,11 +120,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -603,9 +612,6 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
-   "name" : "ASN1_TIME_set_string_X509"
-  },
-  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1857,6 +1863,18 @@
    "name" : "CRYPTO_MUTEX_unlock_write"
   },
   {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_lock_write"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_read"
+  },
+  {
+   "name" : "CRYPTO_STATIC_MUTEX_unlock_write"
+  },
+  {
    "name" : "CRYPTO_THREADID_current"
   },
   {
@@ -2598,18 +2616,6 @@
    "name" : "EC_get_builtin_curves"
   },
   {
-   "name" : "EC_group_p224"
-  },
-  {
-   "name" : "EC_group_p256"
-  },
-  {
-   "name" : "EC_group_p384"
-  },
-  {
-   "name" : "EC_group_p521"
-  },
-  {
    "name" : "EC_hash_to_curve_p256_xmd_sha256_sswu"
   },
   {
@@ -3066,15 +3072,6 @@
    "name" : "EVP_HPKE_CTX_seal"
   },
   {
-   "name" : "EVP_HPKE_CTX_setup_auth_recipient"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender"
-  },
-  {
-   "name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing"
-  },
-  {
    "name" : "EVP_HPKE_CTX_setup_recipient"
   },
   {
@@ -3510,9 +3507,6 @@
    "name" : "EVP_aead_aes_128_cbc_sha1_tls_implicit_iv"
   },
   {
-   "name" : "EVP_aead_aes_128_cbc_sha256_tls"
-  },
-  {
    "name" : "EVP_aead_aes_128_ccm_bluetooth"
   },
   {
@@ -3732,9 +3726,6 @@
    "name" : "EVP_sha256"
   },
   {
-   "name" : "EVP_sha256_final_with_secret_suffix"
-  },
-  {
    "name" : "EVP_sha384"
   },
   {
@@ -4179,69 +4170,6 @@
    "name" : "OPENSSL_secure_malloc"
   },
   {
-   "name" : "OPENSSL_sk_deep_copy"
-  },
-  {
-   "name" : "OPENSSL_sk_delete"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_if"
-  },
-  {
-   "name" : "OPENSSL_sk_delete_ptr"
-  },
-  {
-   "name" : "OPENSSL_sk_dup"
-  },
-  {
-   "name" : "OPENSSL_sk_find"
-  },
-  {
-   "name" : "OPENSSL_sk_free"
-  },
-  {
-   "name" : "OPENSSL_sk_insert"
-  },
-  {
-   "name" : "OPENSSL_sk_is_sorted"
-  },
-  {
-   "name" : "OPENSSL_sk_new"
-  },
-  {
-   "name" : "OPENSSL_sk_new_null"
-  },
-  {
-   "name" : "OPENSSL_sk_num"
-  },
-  {
-   "name" : "OPENSSL_sk_pop"
-  },
-  {
-   "name" : "OPENSSL_sk_pop_free_ex"
-  },
-  {
-   "name" : "OPENSSL_sk_push"
-  },
-  {
-   "name" : "OPENSSL_sk_set"
-  },
-  {
-   "name" : "OPENSSL_sk_set_cmp_func"
-  },
-  {
-   "name" : "OPENSSL_sk_shift"
-  },
-  {
-   "name" : "OPENSSL_sk_sort"
-  },
-  {
-   "name" : "OPENSSL_sk_value"
-  },
-  {
-   "name" : "OPENSSL_sk_zero"
-  },
-  {
    "name" : "OPENSSL_strcasecmp"
   },
   {
@@ -4848,27 +4776,6 @@
    "name" : "RSA_new_method"
   },
   {
-   "name" : "RSA_new_method_no_e"
-  },
-  {
-   "name" : "RSA_new_private_key"
-  },
-  {
-   "name" : "RSA_new_private_key_large_e"
-  },
-  {
-   "name" : "RSA_new_private_key_no_crt"
-  },
-  {
-   "name" : "RSA_new_private_key_no_e"
-  },
-  {
-   "name" : "RSA_new_public_key"
-  },
-  {
-   "name" : "RSA_new_public_key_large_e"
-  },
-  {
    "name" : "RSA_padding_add_PKCS1_OAEP_mgf1"
   },
   {
@@ -7458,9 +7365,36 @@
    "name" : "s2i_ASN1_OCTET_STRING"
   },
   {
+   "name" : "sk_deep_copy"
+  },
+  {
+   "name" : "sk_delete"
+  },
+  {
+   "name" : "sk_delete_if"
+  },
+  {
+   "name" : "sk_delete_ptr"
+  },
+  {
+   "name" : "sk_dup"
+  },
+  {
+   "name" : "sk_find"
+  },
+  {
    "name" : "sk_free"
   },
   {
+   "name" : "sk_insert"
+  },
+  {
+   "name" : "sk_is_sorted"
+  },
+  {
+   "name" : "sk_new"
+  },
+  {
    "name" : "sk_new_null"
   },
   {
@@ -7479,9 +7413,24 @@
    "name" : "sk_push"
   },
   {
+   "name" : "sk_set"
+  },
+  {
+   "name" : "sk_set_cmp_func"
+  },
+  {
+   "name" : "sk_shift"
+  },
+  {
+   "name" : "sk_sort"
+  },
+  {
    "name" : "sk_value"
   },
   {
+   "name" : "sk_zero"
+  },
+  {
    "name" : "v2i_GENERAL_NAME"
   },
   {
@@ -8546,23 +8495,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     },
     {
-     "referenced_type" : "_ZTIPKv"
+     "referenced_type" : "_ZTIPKPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8926,30 +8875,6 @@
      "referenced_type" : "_ZTIPP13ASN1_VALUE_st"
     },
     {
-     "referenced_type" : "_ZTIPK12ASN1_ITEM_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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"
     },
     {
@@ -10450,21 +10375,6 @@
    "source_file" : "external/boringssl/src/include/openssl/asn1.h"
   },
   {
-   "function_name" : "ASN1_TIME_set_string_X509",
-   "linker_set_key" : "ASN1_TIME_set_string_X509",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
    "function_name" : "ASN1_TIME_to_generalizedtime",
    "linker_set_key" : "ASN1_TIME_to_generalizedtime",
    "parameters" :
@@ -16342,21 +16252,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
-   "function_name" : "EC_get_builtin_curves",
-   "linker_set_key" : "EC_get_builtin_curves",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP16EC_builtin_curve"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
    "function_name" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "linker_set_key" : "EC_hash_to_curve_p256_xmd_sha256_sswu",
    "parameters" :
@@ -17416,135 +17311,6 @@
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_recipient",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
-   "function_name" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "linker_set_key" : "EVP_HPKE_CTX_setup_auth_sender_with_seed_for_testing",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP15evp_hpke_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_key_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK15evp_hpke_kdf_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK16evp_hpke_aead_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/hpke.h"
-  },
-  {
    "function_name" : "EVP_HPKE_CTX_setup_recipient",
    "linker_set_key" : "EVP_HPKE_CTX_setup_recipient",
    "parameters" :
@@ -19429,12 +19195,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "linker_set_key" : "EVP_aead_aes_128_cbc_sha256_tls",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -20959,318 +20719,6 @@
    "source_file" : "external/boringssl/src/include/openssl/mem.h"
   },
   {
-   "function_name" : "OPENSSL_sk_deep_copy",
-   "linker_set_key" : "OPENSSL_sk_deep_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFPvPKvE"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete",
-   "linker_set_key" : "OPENSSL_sk_delete",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_if",
-   "linker_set_key" : "OPENSSL_sk_delete_if",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPvS_E"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_delete_ptr",
-   "linker_set_key" : "OPENSSL_sk_delete_ptr",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_dup",
-   "linker_set_key" : "OPENSSL_sk_dup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_find",
-   "linker_set_key" : "OPENSSL_sk_find",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_free",
-   "linker_set_key" : "OPENSSL_sk_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_insert",
-   "linker_set_key" : "OPENSSL_sk_insert",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_is_sorted",
-   "linker_set_key" : "OPENSSL_sk_is_sorted",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new",
-   "linker_set_key" : "OPENSSL_sk_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_new_null",
-   "linker_set_key" : "OPENSSL_sk_new_null",
-   "return_type" : "_ZTIP8stack_st",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_num",
-   "linker_set_key" : "OPENSSL_sk_num",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop",
-   "linker_set_key" : "OPENSSL_sk_pop",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_pop_free_ex",
-   "linker_set_key" : "OPENSSL_sk_pop_free_ex",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPFvPvES_E"
-    },
-    {
-     "referenced_type" : "_ZTIPFvPvE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_push",
-   "linker_set_key" : "OPENSSL_sk_push",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set",
-   "linker_set_key" : "OPENSSL_sk_set",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_set_cmp_func",
-   "linker_set_key" : "OPENSSL_sk_set_cmp_func",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPKPKvS2_E"
-    }
-   ],
-   "return_type" : "_ZTIPFiPKPKvS2_E",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_shift",
-   "linker_set_key" : "OPENSSL_sk_shift",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_sort",
-   "linker_set_key" : "OPENSSL_sk_sort",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_value",
-   "linker_set_key" : "OPENSSL_sk_value",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK8stack_st"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
-   "function_name" : "OPENSSL_sk_zero",
-   "linker_set_key" : "OPENSSL_sk_zero",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP8stack_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
-  },
-  {
    "function_name" : "OPENSSL_strcasecmp",
    "linker_set_key" : "OPENSSL_strcasecmp",
    "parameters" :
@@ -27786,10 +27234,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27858,7 +27306,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29874,7 +29322,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPKc"
+     "referenced_type" : "_ZTIPc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30663,7 +30111,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31908,7 +31356,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31929,7 +31377,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPKl"
+     "referenced_type" : "_ZTIPl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -36283,6 +35731,114 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
+   "function_name" : "sk_deep_copy",
+   "linker_set_key" : "sk_deep_copy",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPFS_PKvES1_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFPvPKvE"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPFvPvES_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPvE"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete",
+   "linker_set_key" : "sk_delete",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_if",
+   "linker_set_key" : "sk_delete_if",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPvS_ES_S_E"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPvS_E"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_delete_ptr",
+   "linker_set_key" : "sk_delete_ptr",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_dup",
+   "linker_set_key" : "sk_dup",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_find",
+   "linker_set_key" : "sk_find",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    },
+    {
+     "referenced_type" : "_ZTIPKv"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_free",
    "linker_set_key" : "sk_free",
    "parameters" :
@@ -36295,6 +35851,48 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_insert",
+   "linker_set_key" : "sk_insert",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIj",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_is_sorted",
+   "linker_set_key" : "sk_is_sorted",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_new",
+   "linker_set_key" : "sk_new",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIP8stack_st",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_new_null",
    "linker_set_key" : "sk_new_null",
    "return_type" : "_ZTIP8stack_st",
@@ -36373,6 +35971,66 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_set",
+   "linker_set_key" : "sk_set",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_set_cmp_func",
+   "linker_set_key" : "sk_set_cmp_func",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPKPKvS2_E"
+    }
+   ],
+   "return_type" : "_ZTIPFiPKPKvS2_E",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_shift",
+   "linker_set_key" : "sk_shift",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIPv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
+   "function_name" : "sk_sort",
+   "linker_set_key" : "sk_sort",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    },
+    {
+     "referenced_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "sk_value",
    "linker_set_key" : "sk_value",
    "parameters" :
@@ -36388,6 +36046,18 @@
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
+   "function_name" : "sk_zero",
+   "linker_set_key" : "sk_zero",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP8stack_st"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+  },
+  {
    "function_name" : "v2i_GENERAL_NAME",
    "linker_set_key" : "v2i_GENERAL_NAME",
    "parameters" :
@@ -37218,6 +36888,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
+   "name" : "bn_mont_ctx_st *",
+   "referenced_type" : "_ZTI14bn_mont_ctx_st",
+   "self_type" : "_ZTIP14bn_mont_ctx_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14private_key_st",
    "name" : "private_key_st *",
    "referenced_type" : "_ZTI14private_key_st",
@@ -37335,15 +37023,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP16EC_builtin_curve",
-   "name" : "EC_builtin_curve *",
-   "referenced_type" : "_ZTI16EC_builtin_curve",
-   "self_type" : "_ZTIP16EC_builtin_curve",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ec.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP16HRSS_private_key",
    "name" : "HRSS_private_key *",
    "referenced_type" : "_ZTI16HRSS_private_key",
@@ -38235,10 +37914,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
-   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *, const void *)",
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
-   "self_type" : "_ZTIPFiPFiPKPKvS2_ES0_S0_E",
+   "linker_set_key" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
+   "name" : "int (*)(int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIPFiPFiPKPKvS2_ES2_S2_E",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38390,15 +38069,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE",
    "name" : "int (*)(int, ASN1_VALUE_st **, const ASN1_ITEM_st *, void *)",
-   "referenced_type" : "_ZTIFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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,
@@ -38669,15 +38339,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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,
@@ -39459,21 +39120,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKl",
-   "name" : "const long *",
-   "referenced_type" : "_ZTIKl",
-   "self_type" : "_ZTIPKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -39675,6 +39327,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14trust_token_st",
    "name" : "trust_token_st **",
    "referenced_type" : "_ZTIP14trust_token_st",
@@ -40076,7 +39737,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40148,7 +39809,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/bio.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -40228,7 +39889,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 480,
+   "size" : 344,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40550,7 +40211,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40570,7 +40231,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 44,
+   "size" : 36,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40970,15 +40631,17 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 76,
+   "size" : 84,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
+   "alignment" : 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"
   },
   {
@@ -41100,22 +40763,12 @@
    "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKl",
-   "name" : "const long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIKl",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -41368,42 +41021,6 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_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"
     },
     {
@@ -42553,7 +42170,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4544,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42561,7 +42178,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42589,22 +42206,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4672,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5376,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5440,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42612,7 +42229,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42905,7 +42522,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIA128_h"
+     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
     },
     {
      "field_name" : "block_used",
@@ -43435,7 +43052,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -43447,7 +43064,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 564,
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43636,6 +43253,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 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"
     },
@@ -43916,6 +43776,28 @@
    "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 a9ad8f02..0db506ff 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,11 +137,13 @@
  "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 c4b359a6..512f1871 100644
--- a/34/64/x86_x86_64/source-based/libcurl.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcurl.so.lsdump
@@ -111,6 +111,12 @@
    "name" : "Curl_all_content_encodings"
   },
   {
+   "name" : "Curl_alpn_get_proxy_spec"
+  },
+  {
+   "name" : "Curl_alpn_get_spec"
+  },
+  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -201,81 +207,9 @@
    "name" : "Curl_base64url_encode"
   },
   {
-   "name" : "Curl_bufcp_free"
-  },
-  {
-   "name" : "Curl_bufcp_init"
-  },
-  {
-   "name" : "Curl_bufcp_put"
-  },
-  {
-   "name" : "Curl_bufcp_take"
-  },
-  {
    "name" : "Curl_buffer_send"
   },
   {
-   "name" : "Curl_bufq_free"
-  },
-  {
-   "name" : "Curl_bufq_init"
-  },
-  {
-   "name" : "Curl_bufq_init2"
-  },
-  {
-   "name" : "Curl_bufq_initp"
-  },
-  {
-   "name" : "Curl_bufq_is_empty"
-  },
-  {
-   "name" : "Curl_bufq_is_full"
-  },
-  {
-   "name" : "Curl_bufq_len"
-  },
-  {
-   "name" : "Curl_bufq_pass"
-  },
-  {
-   "name" : "Curl_bufq_peek"
-  },
-  {
-   "name" : "Curl_bufq_peek_at"
-  },
-  {
-   "name" : "Curl_bufq_read"
-  },
-  {
-   "name" : "Curl_bufq_reset"
-  },
-  {
-   "name" : "Curl_bufq_sipn"
-  },
-  {
-   "name" : "Curl_bufq_skip"
-  },
-  {
-   "name" : "Curl_bufq_skip_and_shift"
-  },
-  {
-   "name" : "Curl_bufq_slurp"
-  },
-  {
-   "name" : "Curl_bufq_slurpn"
-  },
-  {
-   "name" : "Curl_bufq_space"
-  },
-  {
-   "name" : "Curl_bufq_write"
-  },
-  {
-   "name" : "Curl_bufq_write_pass"
-  },
-  {
    "name" : "Curl_bufref_free"
   },
   {
@@ -345,9 +279,6 @@
    "name" : "Curl_cf_def_send"
   },
   {
-   "name" : "Curl_cf_h1_proxy_insert_after"
-  },
-  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -360,9 +291,6 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
-   "name" : "Curl_cf_http_proxy_get_host"
-  },
-  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -438,13 +366,13 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard_all"
+   "name" : "Curl_conn_cf_discard"
   },
   {
-   "name" : "Curl_conn_cf_discard_chain"
+   "name" : "Curl_conn_cf_discard_all"
   },
   {
-   "name" : "Curl_conn_cf_discard_sub"
+   "name" : "Curl_conn_cf_discard_chain"
   },
   {
    "name" : "Curl_conn_cf_get_select_socks"
@@ -456,9 +384,6 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
-   "name" : "Curl_conn_cf_is_ssl"
-  },
-  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -513,6 +438,9 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
+   "name" : "Curl_conn_http_proxy_add"
+  },
+  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -681,72 +609,6 @@
    "name" : "Curl_dyn_vprintf"
   },
   {
-   "name" : "Curl_dynhds_add"
-  },
-  {
-   "name" : "Curl_dynhds_add_custom"
-  },
-  {
-   "name" : "Curl_dynhds_cadd"
-  },
-  {
-   "name" : "Curl_dynhds_ccontains"
-  },
-  {
-   "name" : "Curl_dynhds_ccount_name"
-  },
-  {
-   "name" : "Curl_dynhds_cget"
-  },
-  {
-   "name" : "Curl_dynhds_contains"
-  },
-  {
-   "name" : "Curl_dynhds_count"
-  },
-  {
-   "name" : "Curl_dynhds_count_name"
-  },
-  {
-   "name" : "Curl_dynhds_cremove"
-  },
-  {
-   "name" : "Curl_dynhds_cset"
-  },
-  {
-   "name" : "Curl_dynhds_free"
-  },
-  {
-   "name" : "Curl_dynhds_get"
-  },
-  {
-   "name" : "Curl_dynhds_getn"
-  },
-  {
-   "name" : "Curl_dynhds_h1_add_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_cadd_line"
-  },
-  {
-   "name" : "Curl_dynhds_h1_dprint"
-  },
-  {
-   "name" : "Curl_dynhds_init"
-  },
-  {
-   "name" : "Curl_dynhds_remove"
-  },
-  {
-   "name" : "Curl_dynhds_reset"
-  },
-  {
-   "name" : "Curl_dynhds_set"
-  },
-  {
-   "name" : "Curl_dynhds_set_opts"
-  },
-  {
    "name" : "Curl_expire"
   },
   {
@@ -819,15 +681,6 @@
    "name" : "Curl_gmtime"
   },
   {
-   "name" : "Curl_h1_req_parse_free"
-  },
-  {
-   "name" : "Curl_h1_req_parse_init"
-  },
-  {
-   "name" : "Curl_h1_req_parse_read"
-  },
-  {
    "name" : "Curl_hash_add"
   },
   {
@@ -930,9 +783,6 @@
    "name" : "Curl_http_cookies"
   },
   {
-   "name" : "Curl_http_decode_status"
-  },
-  {
    "name" : "Curl_http_done"
   },
   {
@@ -960,24 +810,6 @@
    "name" : "Curl_http_readwrite_headers"
   },
   {
-   "name" : "Curl_http_req_free"
-  },
-  {
-   "name" : "Curl_http_req_make"
-  },
-  {
-   "name" : "Curl_http_req_make2"
-  },
-  {
-   "name" : "Curl_http_req_to_h2"
-  },
-  {
-   "name" : "Curl_http_resp_free"
-  },
-  {
-   "name" : "Curl_http_resp_make"
-  },
-  {
    "name" : "Curl_http_resume"
   },
   {
@@ -1653,9 +1485,6 @@
    "name" : "Curl_updatesocket"
   },
   {
-   "name" : "Curl_url_set_authority"
-  },
-  {
    "name" : "Curl_urldecode"
   },
   {
@@ -2019,9 +1848,6 @@
    "name" : "Curl_cfree"
   },
   {
-   "name" : "Curl_cft_h1_proxy"
-  },
-  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4429,10 +4255,6 @@
      "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
new file mode 100644
index 00000000..18926e4b
--- /dev/null
+++ b/34/64/x86_x86_64/source-based/libdiskconfig.so.lsdump
@@ -0,0 +1,641 @@
+{
+ "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 35864ff1..310b5b3e 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" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1551,7 +1551,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "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 01f6102f..f5754d79 100644
--- a/34/64/x86_x86_64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libdumpstateutil.so.lsdump
@@ -152,9 +152,6 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -204,9 +201,6 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
-   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
-  },
-  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -579,12 +573,6 @@
    "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
   },
   {
-   "function_name" : "android::os::dumpstate::PropertiesHelper::IsStrictRun",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv",
-   "return_type" : "_ZTIb",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
    "function_name" : "android::os::dumpstate::PropertiesHelper::IsUserBuild",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv",
    "return_type" : "_ZTIb",
@@ -723,13 +711,6 @@
   },
   {
    "access" : "private",
-   "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E",
-   "name" : "android::os::dumpstate::PropertiesHelper::strict_run_",
-   "referenced_type" : "_ZTIi",
-   "source_file" : "frameworks/native/cmds/dumpstate/DumpstateUtil.h"
-  },
-  {
-   "access" : "private",
    "linker_set_key" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E",
    "name" : "android::os::dumpstate::PropertiesHelper::parallel_run_",
    "referenced_type" : "_ZTIi",
diff --git a/34/64/x86_x86_64/source-based/libgralloctypes.so.lsdump b/34/64/x86_x86_64/source-based/libgralloctypes.so.lsdump
index c5494745..123e644e 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3467,11 +3467,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4052,11 +4052,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/libhardware.so.lsdump b/34/64/x86_x86_64/source-based/libhardware.so.lsdump
index d9bf0a87..a385fd5a 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -935,7 +935,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -992,7 +992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1069,7 +1069,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1078,7 +1078,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1087,7 +1087,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1118,7 +1118,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1128,7 +1128,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1167,7 +1167,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1223,7 +1223,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1414,7 +1414,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump b/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump
index 928d88f3..797c7886 100644
--- a/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump
@@ -263,6 +263,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -275,6 +283,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -287,6 +299,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -295,11 +311,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
@@ -1873,6 +1889,22 @@
    "name" : "_ZN7android8hardware21writeEmbeddedToParcelERKNS0_11hidl_stringEPNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware22configureRpcThreadpoolEjb"
   },
   {
@@ -1888,6 +1920,22 @@
    "name" : "_ZN7android8hardware22readEmbeddedFromParcelERKNS0_11hidl_stringERKNS0_6ParcelEjj"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj"
+  },
+  {
    "name" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE"
   },
   {
@@ -2349,6 +2397,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE"
   },
   {
@@ -2752,6 +2820,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE18__lookup_classnameIPKcEEtT_S5_bc"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__112regex_traitsIcE19__transform_primaryINS_11__wrap_iterIPcEEEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SC_c"
   },
   {
@@ -2768,6 +2840,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2828,6 +2904,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE4findIS7_EENS_21__tree_const_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEERKT_"
   },
   {
@@ -2836,6 +2916,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNKSt3__18functionIFbbEEclEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2844,15 +2928,19 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
+   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_loopEjjPNS_16__owns_one_stateIcEEjjb"
   },
   {
    "binding" : "weak",
@@ -2868,10 +2956,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__parse_BACKREFIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE15__push_back_refEi"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ORD_CHARIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE16__parse_ecma_expIPKcEET_S7_S7_"
   },
   {
@@ -2888,6 +2984,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE17__parse_simple_REIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_ERE_branchIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE18__parse_awk_escapeIPKcEET_S7_S7_PNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -2924,6 +3028,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2968,10 +3076,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE25__parse_pattern_characterIPKcEET_S7_S7_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE26__parse_bracket_expressionIPKcEET_S7_S7_"
   },
   {
@@ -2988,6 +3092,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__parse_one_char_or_coll_elem_EREIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE33__push_begin_marked_subexpressionEv"
   },
   {
@@ -2996,10 +3104,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111unique_lockINS_5mutexEE6unlockEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE3endEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEE5clearEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_7__stateIcEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEE3endEv"
   },
   {
@@ -3008,6 +3128,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8functionIFvvEEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112regex_traitsIcE6__initEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
   },
   {
@@ -3016,14 +3144,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS_6vectorIPKcNS_9allocatorISA_EEEEEENSB_ISE_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_4pairIccEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseINS_4pairIjPKcEENS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -3036,6 +3180,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3044,6 +3192,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE11__read_modeEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE12__write_modeEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113basic_filebufIcNS_11char_traitsIcEEE4openEPKcj"
   },
   {
@@ -3096,7 +3252,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
+   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
   },
   {
    "binding" : "weak",
@@ -3104,10 +3260,46 @@
   },
   {
    "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_"
   },
   {
@@ -3128,6 +3320,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3136,6 +3332,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3144,11 +3344,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
@@ -3156,6 +3356,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -3220,10 +3424,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS1_8hardware9SchedPrioENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_S9_EEEEEixERSE_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapIN7android2wpINS1_4hidl4base4V1_05IBaseEEEbNS_4lessIS7_EENS_9allocatorINS_4pairIKS7_bEEEEEixERSC_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS4_IiEEEENS8_IS6_EENS4_INS_4pairIKS6_SB_EEEEEixERSE_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_4hidl4base4V1_05IBaseEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SH_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS8_8hardware7IBinderEEEPvEEENS_4lessIS6_EENS4_INS_4pairIKS6_SF_EEEEEixEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__13mapIPKN7android4hidl4base4V1_05IBaseENS1_2wpINS1_8hardware9BHwBinderEEENS_4lessIS7_EENS_9allocatorINS_4pairIKS7_SB_EEEEEixERSG_"
   },
   {
@@ -3260,26 +3480,70 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISN_EERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_10unique_ptrINS_11__tree_nodeISB_PvEENS_22__tree_node_destructorINSG_ISV_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE4findIS8_EENS_15__tree_iteratorISB_PNS_11__tree_nodeISB_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware9SchedPrioEEENS_19__map_value_compareIS8_SB_NS_4lessIS8_EELb1EEENS_9allocatorISB_EEE5eraseENS_21__tree_const_iteratorISB_PNS_11__tree_nodeISB_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE12__find_equalIS8_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISL_EERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE14__erase_uniqueIS8_EEjRKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__construct_nodeIJRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_10unique_ptrINS_11__tree_nodeIS9_PvEENS_22__tree_node_destructorINSE_IST_EEEEEEDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSL_SL_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE4findIS8_EENS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEERKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE5eraseENS_21__tree_const_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISP_EERKT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSP_SP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEENS_19__map_value_compareIS7_SE_NS_4lessIS7_EELb1EEENS5_ISE_EEE25__emplace_unique_key_argsIS7_JS7_SD_EEENS_4pairINS_15__tree_iteratorISE_PNS_11__tree_nodeISE_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3296,6 +3560,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSN_SN_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_3setIiNS_4lessIiEENS5_IiEEEEEENS_19__map_value_compareIS7_SD_NS9_IS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSN_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_"
   },
   {
@@ -3308,7 +3576,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISG_EEEERST_ST_"
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSU_IJEEEEEENS_4pairINS_15__tree_iteratorISJ_PNS_11__tree_nodeISJ_SG_EEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
@@ -3324,6 +3596,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE14__erase_uniqueIS7_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseISE_EEEERSR_SR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJOS7_EEENSS_IJEEEEEENS_4pairINS_15__tree_iteratorISH_PNS_11__tree_nodeISH_SE_EEiEEbEERKT_DpOT0_"
   },
   {
@@ -3344,15 +3624,19 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16__treeINS_12__value_typeIPKN7android4hidl4base4V1_05IBaseENS2_2wpINS2_8hardware9BHwBinderEEEEENS_19__map_value_compareIS8_SD_NS_4lessIS8_EELb1EEENS_9allocatorISD_EEE5eraseENS_21__tree_const_iteratorISD_PNS_11__tree_nodeISD_PvEEiEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
@@ -3368,6 +3652,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3380,6 +3672,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIN7android4hidl4base4V1_09DebugInfo12ArchitectureENS0_IPKcNS_9allocatorIS9_EEEEEENSA_ISD_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES7_EENS5_IS8_EEE21__push_back_slow_pathIS8_EEvOT_"
   },
   {
@@ -3388,6 +3684,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIccEENS_9allocatorIS2_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_4pairIjPKcEENS_9allocatorIS4_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS4_RS6_EE"
   },
   {
@@ -3412,10 +3720,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS8_S8_S8_PNS0_IPvNS_9allocatorIS9_EEEEEEENSA_ISF_EEEC2ERKSH_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchINS_11__wrap_iterIPKcEEEENS_9allocatorIS6_EEE6resizeEj"
   },
   {
@@ -3456,10 +3772,22 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPKcNS_9allocatorIS2_EEEC2ERKS5_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE21__push_back_slow_pathIS1_EEvOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIPvNS_9allocatorIS1_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS1_RS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE21__push_back_slow_pathIRKcEEvOT_"
   },
   {
@@ -3468,6 +3796,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIcNS_9allocatorIcEEE26__swap_out_circular_bufferERNS_14__split_bufferIcRS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2INS_21__tree_const_iteratorIiPNS_11__tree_nodeIiPvEEiEEEET_NS_9enable_ifIXaasr21__is_forward_iteratorISB_EE5valuesr16is_constructibleIiNS_15iterator_traitsISB_E9referenceEEE5valueESB_E4typeE"
   },
   {
@@ -3476,6 +3812,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3764,6 +4104,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -3795,6 +4139,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -3880,6 +4228,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4027,6 +4379,10 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
+  },
+  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4036,6 +4392,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4045,6 +4405,10 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
+  },
+  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4071,6 +4435,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8455,6 +8823,42 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::base::V1_0::IBase>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl4base4V1_05IBaseEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl4base4V1_05IBaseEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_215IServiceManagerE"
+   ]
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_",
    "parameters" :
@@ -8503,6 +8907,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_",
    "parameters" :
@@ -8552,6 +8972,22 @@
   },
   {
    "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>::operator=",
    "linker_set_key" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE",
    "parameters" :
    [
@@ -8584,35 +9020,35 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "function_name" : "android::sp<android::hardware::hidl_binder_death_recipient>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     },
     {
-     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7IBinderEEE"
     },
     {
-     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+     "referenced_type" : "_ZTION7android2spINS_8hardware7IBinderEEE"
     }
    ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "return_type" : "_ZTIRN7android2spINS_8hardware7IBinderEEE",
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -16946,6 +17382,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware21writeEmbeddedToParcelIiEEiRKNS0_8hidl_vecIT_EEPNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::configureRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware22configureRpcThreadpoolEjb",
    "parameters" :
@@ -17036,6 +17584,118 @@
    "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_10hidl_arrayIhLj32EJEEEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10hidl_arrayIhLj32EJEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS0_11hidl_stringEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware11hidl_stringE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware22readEmbeddedFromParcelIiEEiRKNS0_8hidl_vecIT_EERKNS0_6ParcelEjjPj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware8hidl_vecIiEE"
+    },
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ParcelE"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "referenced_type" : "_ZTIPj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "system/libhidl/transport/include/hidl/HidlBinderSupport.h",
+   "template_args" :
+   [
+    "_ZTIi"
+   ]
+  },
+  {
    "function_name" : "android::hardware::getOrCreateCachedBinder",
    "linker_set_key" : "_ZN7android8hardware23getOrCreateCachedBinderEPNS_4hidl4base4V1_05IBaseE",
    "parameters" :
@@ -19050,6 +19710,91 @@
   },
   {
    "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
+   "linker_set_key" : "_ZN7android8hardware7details8StatusOfIbNS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEENS0_6ReturnIT0_EERKNS9_IT_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIRKN7android8hardware6ReturnIbEE"
+    }
+   ],
+   "return_type" : "_ZTIN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE",
+   "source_file" : "system/libhidl/base/include/hidl/Status.h",
+   "template_args" :
+   [
+    "_ZTIb",
+    "_ZTIN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
+   ]
+  },
+  {
+   "function_name" : "android::hardware::details::StatusOf",
    "linker_set_key" : "_ZN7android8hardware7details8StatusOfIvbEENS0_6ReturnIT0_EERKNS3_IT_EE",
    "parameters" :
    [
@@ -21419,8 +22164,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/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",
+   "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",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -22770,7 +23515,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/e560d7b19ebf7276b3e850d3d346dec8/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/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 d8e18241..88257567 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,33 +667,21 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
-   "name" : "_ZN7android14AudioParameter10valueHacOnE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
-   "name" : "_ZN7android14AudioParameter11valueHacOffE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
-   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -715,15 +703,6 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
-  },
-  {
-   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -733,9 +712,6 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
-   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
-  },
-  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1449,24 +1425,12 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10keyTtyModeE",
-   "name" : "android::AudioParameter::keyTtyMode",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter10valueFalseE",
    "name" : "android::AudioParameter::valueFalse",
    "referenced_type" : "_ZTIKPKc",
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter10valueHacOnE",
-   "name" : "android::AudioParameter::valueHacOn",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter11keyChannelsE",
    "name" : "android::AudioParameter::keyChannels",
    "referenced_type" : "_ZTIKPKc",
@@ -1479,12 +1443,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter11valueHacOffE",
-   "name" : "android::AudioParameter::valueHacOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter12keyProgramIdE",
    "name" : "android::AudioParameter::keyProgramId",
    "referenced_type" : "_ZTIKPKc",
@@ -1497,12 +1455,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter13keyHacSettingE",
-   "name" : "android::AudioParameter::keyHacSetting",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter13keyMonoOutputE",
    "name" : "android::AudioParameter::keyMonoOutput",
    "referenced_type" : "_ZTIKPKc",
@@ -1545,24 +1497,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeHcoE",
-   "name" : "android::AudioParameter::valueTtyModeHco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeOffE",
-   "name" : "android::AudioParameter::valueTtyModeOff",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android14AudioParameter15valueTtyModeVcoE",
-   "name" : "android::AudioParameter::valueTtyModeVco",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter16keyBtLeSuspendedE",
    "name" : "android::AudioParameter::keyBtLeSuspended",
    "referenced_type" : "_ZTIKPKc",
@@ -1581,12 +1515,6 @@
    "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
   },
   {
-   "linker_set_key" : "_ZN7android14AudioParameter16valueTtyModeFullE",
-   "name" : "android::AudioParameter::valueTtyModeFull",
-   "referenced_type" : "_ZTIKPKc",
-   "source_file" : "frameworks/av/media/libmediahelper/include/media/AudioParameter.h"
-  },
-  {
    "linker_set_key" : "_ZN7android14AudioParameter17keyPresentationIdE",
    "name" : "android::AudioParameter::keyPresentationId",
    "referenced_type" : "_ZTIKPKc",
diff --git a/34/64/x86_x86_64/source-based/libmedia_omx.so.lsdump b/34/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
index 5ef97bed..c78e932b 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5548,7 +5548,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "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" : 4026531840,
+     "enum_field_value" : -268435456,
      "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_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/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" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10605,11 +10605,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11196,11 +11196,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11781,11 +11781,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12744,7 +12744,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12762,7 +12762,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12795,7 +12795,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12810,7 +12810,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12828,7 +12828,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12846,7 +12846,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12873,7 +12873,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17046,7 +17046,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17073,7 +17073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17100,7 +17100,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17118,7 +17118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17235,7 +17235,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17244,7 +17244,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17253,7 +17253,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17262,7 +17262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17271,7 +17271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17280,7 +17280,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17289,7 +17289,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/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_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18886,15 +18886,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "_ZTIN7android12LightRefBaseINS_5FenceEEE",
-   "self_type" : "_ZTIPN7android12LightRefBaseINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android12NativeHandleE",
    "name" : "android::NativeHandle *",
    "referenced_type" : "_ZTIN7android12NativeHandleE",
@@ -19003,15 +18994,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "_ZTIN7android19FenceToFenceTimeMapE",
-   "self_type" : "_ZTIPN7android19FenceToFenceTimeMapE",
-   "size" : 4,
-   "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android19GraphicBufferMapperE",
    "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "_ZTIN7android19GraphicBufferMapperE",
@@ -20358,7 +20340,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20385,7 +20367,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20565,7 +20547,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20595,7 +20577,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22370,13 +22352,11 @@
    "source_file" : "frameworks/av/media/libmedia/include/media/MediaCodecBuffer.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
    "name" : "const std::shared_ptr<android::FenceTime>",
    "referenced_type" : "_ZTINSt3__110shared_ptrIN7android9FenceTimeEEE",
    "self_type" : "_ZTIKNSt3__110shared_ptrIN7android9FenceTimeEEE",
-   "size" : 8,
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -23184,7 +23164,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23240,7 +23220,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23425,7 +23405,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23569,7 +23549,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23862,7 +23842,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24244,7 +24224,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35363,12 +35343,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43473,15 +43447,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ALooperEEE",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ALooperEEE",
diff --git a/34/64/x86_x86_64/source-based/libprocessgroup.so.lsdump b/34/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
index a63c9c64..a375167c 100644
--- a/34/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
@@ -145,9 +145,6 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
-   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
-  },
-  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -249,7 +246,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1137,15 +1134,9 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1161,15 +1152,9 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1182,18 +1167,12 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1221,42 +1200,21 @@
    "name" : "_ZNK16ProfileAttribute14GetPathForTaskEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
-   "name" : "_ZNK16ProfileAttribute17GetPathForProcessEjiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
-   "name" : "_ZNK16ProfileAttribute9file_nameEv"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction14IsValidForTaskEi"
-  },
-  {
    "name" : "_ZNK18ApplyProfileAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18ApplyProfileAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction13ExecuteForUIDEj"
   },
   {
    "name" : "_ZNK18SetAttributeAction14ExecuteForTaskEi"
   },
   {
-   "name" : "_ZNK18SetAttributeAction14IsValidForTaskEi"
-  },
-  {
-   "name" : "_ZNK18SetAttributeAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZNK18SetAttributeAction17ExecuteForProcessEji"
   },
   {
-   "name" : "_ZNK18SetAttributeAction17IsValidForProcessEji"
-  },
-  {
    "name" : "_ZNK19SetTimerSlackAction14ExecuteForTaskEi"
   },
   {
diff --git a/34/64/x86_x86_64/source-based/libsqlite.so.lsdump b/34/64/x86_x86_64/source-based/libsqlite.so.lsdump
index 4282a1df..4e718747 100644
--- a/34/64/x86_x86_64/source-based/libsqlite.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libsqlite.so.lsdump
@@ -337,9 +337,6 @@
    "name" : "sqlite3_interrupt"
   },
   {
-   "name" : "sqlite3_is_interrupted"
-  },
-  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -694,9 +691,6 @@
    "name" : "sqlite3_value_dup"
   },
   {
-   "name" : "sqlite3_value_encoding"
-  },
-  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/x86_x86_64/source-based/libssl.so.lsdump b/34/64/x86_x86_64/source-based/libssl.so.lsdump
index 4b220fb2..b1977369 100644
--- a/34/64/x86_x86_64/source-based/libssl.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libssl.so.lsdump
@@ -20,15 +20,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "linker_set_key" : "_ZTIA13_22SignatureAlgorithmName",
-   "name" : "SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA1424_h",
    "name" : "unsigned char[1424]",
@@ -74,15 +65,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA24_13ssl_cipher_st",
-   "name" : "ssl_cipher_st[24]",
-   "referenced_type" : "_ZTI13ssl_cipher_st",
-   "self_type" : "_ZTIA24_13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA24_h",
    "name" : "unsigned char[24]",
@@ -137,15 +119,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA3_PKc",
-   "name" : "const char *[3]",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIA3_PKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "linker_set_key" : "_ZTIA3_t",
    "name" : "unsigned short[3]",
@@ -192,11 +165,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA564_h",
-   "name" : "unsigned char[564]",
+   "linker_set_key" : "_ZTIA580_h",
+   "name" : "unsigned char[580]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA564_h",
-   "size" : 564,
+   "self_type" : "_ZTIA580_h",
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -227,24 +200,6 @@
    "source_file" : "external/boringssl/src/include/openssl/sha.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl10NamedGroupE",
-   "name" : "bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIN4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA6_N4bssl11VersionInfoE",
-   "name" : "bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA7776_h",
    "name" : "unsigned char[7776]",
@@ -555,9 +510,6 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
-   "name" : "SSL_CIPHER_get_handshake_digest"
-  },
-  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -582,6 +534,9 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
+   "name" : "SSL_CIPHER_get_value"
+  },
+  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -846,9 +801,6 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
-   "name" : "SSL_CTX_set1_group_ids"
-  },
-  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1410,24 +1362,6 @@
    "name" : "SSL_get_SSL_CTX"
   },
   {
-   "name" : "SSL_get_all_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_curve_names"
-  },
-  {
-   "name" : "SSL_get_all_group_names"
-  },
-  {
-   "name" : "SSL_get_all_signature_algorithm_names"
-  },
-  {
-   "name" : "SSL_get_all_standard_cipher_names"
-  },
-  {
-   "name" : "SSL_get_all_version_names"
-  },
-  {
    "name" : "SSL_get_certificate"
   },
   {
@@ -1488,12 +1422,6 @@
    "name" : "SSL_get_finished"
   },
   {
-   "name" : "SSL_get_group_id"
-  },
-  {
-   "name" : "SSL_get_group_name"
-  },
-  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1515,9 +1443,6 @@
    "name" : "SSL_get_mode"
   },
   {
-   "name" : "SSL_get_negotiated_group"
-  },
-  {
    "name" : "SSL_get_options"
   },
   {
@@ -1788,9 +1713,6 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
-   "name" : "SSL_set1_group_ids"
-  },
-  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2169,9 +2091,6 @@
    "name" : "_ZN4bssl24ssl_cert_check_key_usageEPK6cbs_stNS_15ssl_key_usage_tE"
   },
   {
-   "name" : "_ZN4bssl24ssl_cipher_is_deprecatedEPK13ssl_cipher_st"
-  },
-  {
    "name" : "_ZN4bssl28ssl_is_valid_ech_public_nameENS_4SpanIKhEE"
   },
   {
@@ -6779,18 +6698,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CIPHER_get_handshake_digest",
-   "linker_set_key" : "SSL_CIPHER_get_handshake_digest",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK13ssl_cipher_st"
-    }
-   ],
-   "return_type" : "_ZTIPK9env_md_st",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CIPHER_get_id",
    "linker_set_key" : "SSL_CIPHER_get_id",
    "parameters" :
@@ -6887,6 +6794,18 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CIPHER_get_value",
+   "linker_set_key" : "SSL_CIPHER_get_value",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPK13ssl_cipher_st"
+    }
+   ],
+   "return_type" : "_ZTIt",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CIPHER_get_version",
    "linker_set_key" : "SSL_CIPHER_get_version",
    "parameters" :
@@ -8045,24 +7964,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_CTX_set1_group_ids",
-   "linker_set_key" : "SSL_CTX_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP10ssl_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_CTX_set1_groups",
    "linker_set_key" : "SSL_CTX_set1_groups",
    "parameters" :
@@ -10898,96 +10799,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_all_cipher_names",
-   "linker_set_key" : "SSL_get_all_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_curve_names",
-   "linker_set_key" : "SSL_get_all_curve_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_group_names",
-   "linker_set_key" : "SSL_get_all_group_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_signature_algorithm_names",
-   "linker_set_key" : "SSL_get_all_signature_algorithm_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_standard_cipher_names",
-   "linker_set_key" : "SSL_get_all_standard_cipher_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_all_version_names",
-   "linker_set_key" : "SSL_get_all_version_names",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_certificate",
    "linker_set_key" : "SSL_get_certificate",
    "parameters" :
@@ -11255,30 +11066,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_group_id",
-   "linker_set_key" : "SSL_get_group_id",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIt",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
-   "function_name" : "SSL_get_group_name",
-   "linker_set_key" : "SSL_get_group_name",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIt"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_info_callback",
    "linker_set_key" : "SSL_get_info_callback",
    "parameters" :
@@ -11372,18 +11159,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_get_negotiated_group",
-   "linker_set_key" : "SSL_get_negotiated_group",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK6ssl_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_get_options",
    "linker_set_key" : "SSL_get_options",
    "parameters" :
@@ -12641,24 +12416,6 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
-   "function_name" : "SSL_set1_group_ids",
-   "linker_set_key" : "SSL_set1_group_ids",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP6ssl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
-  },
-  {
    "function_name" : "SSL_set1_groups",
    "linker_set_key" : "SSL_set1_groups",
    "parameters" :
@@ -14485,15 +14242,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName (&)[13]",
-   "referenced_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "self_type" : "_ZTIRA13_K22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA16_Kh",
    "name" : "const unsigned char (&)[16]",
    "referenced_type" : "_ZTIA16_Kh",
@@ -14521,15 +14269,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st (&)[24]",
-   "referenced_type" : "_ZTIA24_K13ssl_cipher_st",
-   "self_type" : "_ZTIRA24_K13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA2_Kh",
    "name" : "const unsigned char (&)[2]",
    "referenced_type" : "_ZTIA2_Kh",
@@ -14575,15 +14314,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_KPKc",
-   "name" : "const char *const (&)[3]",
-   "referenced_type" : "_ZTIA3_KPKc",
-   "self_type" : "_ZTIRA3_KPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA3_Kt",
    "name" : "const unsigned short (&)[3]",
    "referenced_type" : "_ZTIA3_Kt",
@@ -14593,15 +14323,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA3_PKc",
-   "name" : "const char *(&)[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIRA3_PKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA4_Kh",
    "name" : "const unsigned char (&)[4]",
    "referenced_type" : "_ZTIA4_Kh",
@@ -14620,24 +14341,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRA6_KN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo (&)[6]",
-   "referenced_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRA6_KN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRA8_Kh",
    "name" : "const unsigned char (&)[8]",
    "referenced_type" : "_ZTIA8_Kh",
@@ -14665,24 +14368,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK13ssl_cipher_st",
-   "name" : "const ssl_cipher_st &",
-   "referenced_type" : "_ZTIK13ssl_cipher_st",
-   "self_type" : "_ZTIRK13ssl_cipher_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName &",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIRK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRK6cbs_st",
    "name" : "const cbs_st &",
    "referenced_type" : "_ZTIK6cbs_st",
@@ -14692,33 +14377,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup &",
-   "referenced_type" : "_ZTIKN4bssl10NamedGroupE",
-   "self_type" : "_ZTIRKN4bssl10NamedGroupE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo &",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIRKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> &",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIRKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> &",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -14872,15 +14530,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKPKc",
-   "name" : "const char *const &",
-   "referenced_type" : "_ZTIKPKc",
-   "self_type" : "_ZTIRKPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKh",
    "name" : "const unsigned char &",
    "referenced_type" : "_ZTIKh",
@@ -14971,15 +14620,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRPKc",
-   "name" : "const char *&",
-   "referenced_type" : "_ZTIPKc",
-   "self_type" : "_ZTIRPKc",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRh",
    "name" : "unsigned char &",
    "referenced_type" : "_ZTIh",
@@ -15100,6 +14740,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP11rsa_meth_st",
+   "name" : "rsa_meth_st *",
+   "referenced_type" : "_ZTI11rsa_meth_st",
+   "self_type" : "_ZTIP11rsa_meth_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ssl_comp_st",
    "name" : "ssl_comp_st *",
    "referenced_type" : "_ZTI11ssl_comp_st",
@@ -15343,6 +14992,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIP14bn_blinding_st",
+   "name" : "bn_blinding_st *",
+   "referenced_type" : "_ZTI14bn_blinding_st",
+   "self_type" : "_ZTIP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIP14bn_mont_ctx_st",
    "name" : "bn_mont_ctx_st *",
    "referenced_type" : "_ZTI14bn_mont_ctx_st",
@@ -18565,15 +18223,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName *",
-   "referenced_type" : "_ZTIK22SignatureAlgorithmName",
-   "self_type" : "_ZTIPK22SignatureAlgorithmName",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK22ssl_early_callback_ctx",
    "name" : "const ssl_early_callback_ctx *",
    "referenced_type" : "_ZTIK22ssl_early_callback_ctx",
@@ -18817,15 +18466,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo *",
-   "referenced_type" : "_ZTIKN4bssl11VersionInfoE",
-   "self_type" : "_ZTIPKN4bssl11VersionInfoE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIK13ssl_cipher_stEE",
    "name" : "const bssl::Span<const ssl_cipher_st> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIK13ssl_cipher_stEE",
@@ -18835,15 +18475,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -18853,24 +18484,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIKbEE",
@@ -18916,15 +18529,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPKN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIKN4bssl4SpanIhEE",
@@ -19501,15 +19105,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIPN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "bssl::Span<const bssl::NamedGroup> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -19519,24 +19114,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIKPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIKbEE",
    "name" : "bssl::Span<const bool> *",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -19582,15 +19159,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *> *",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIPN4bssl4SpanIPKcEE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPN4bssl4SpanIhEE",
    "name" : "bssl::Span<unsigned char> *",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -19753,6 +19321,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPP14bn_blinding_st",
+   "name" : "bn_blinding_st **",
+   "referenced_type" : "_ZTIP14bn_blinding_st",
+   "self_type" : "_ZTIPP14bn_blinding_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/rsa.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPP14ssl_session_st",
    "name" : "ssl_session_st **",
    "referenced_type" : "_ZTIP14ssl_session_st",
@@ -19785,7 +19362,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19821,7 +19398,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
    "alignment" : 4,
@@ -19891,16 +19468,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA13_K22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName[13]",
-   "referenced_type" : "_ZTIA13_22SignatureAlgorithmName",
-   "self_type" : "_ZTIA13_K22SignatureAlgorithmName",
-   "size" : 338,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA16_Kh",
@@ -19931,16 +19498,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA24_K13ssl_cipher_st",
-   "name" : "const ssl_cipher_st[24]",
-   "referenced_type" : "_ZTIA24_13ssl_cipher_st",
-   "self_type" : "_ZTIA24_K13ssl_cipher_st",
-   "size" : 768,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA2_Kh",
@@ -19981,16 +19538,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA3_KPKc",
-   "name" : "const char *const[3]",
-   "referenced_type" : "_ZTIA3_PKc",
-   "self_type" : "_ZTIA3_KPKc",
-   "size" : 12,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "_ZTIA3_Kt",
@@ -20021,26 +19568,6 @@
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "name" : "const bssl::NamedGroup[6]",
-   "referenced_type" : "_ZTIA6_N4bssl10NamedGroupE",
-   "self_type" : "_ZTIA6_KN4bssl10NamedGroupE",
-   "size" : 432,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo[6]",
-   "referenced_type" : "_ZTIA6_N4bssl11VersionInfoE",
-   "self_type" : "_ZTIA6_KN4bssl11VersionInfoE",
-   "size" : 48,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "_ZTIA8_Kh",
@@ -20341,7 +19868,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20667,16 +20194,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK22SignatureAlgorithmName",
-   "name" : "const SignatureAlgorithmName",
-   "referenced_type" : "_ZTI22SignatureAlgorithmName",
-   "self_type" : "_ZTIK22SignatureAlgorithmName",
-   "size" : 26,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK22ssl_early_callback_ctx",
@@ -20849,11 +20366,13 @@
    "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"
   },
   {
@@ -20905,17 +20424,7 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 72,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl11VersionInfoE",
-   "name" : "const bssl::VersionInfo",
-   "referenced_type" : "_ZTIN4bssl11VersionInfoE",
-   "self_type" : "_ZTIKN4bssl11VersionInfoE",
-   "size" : 8,
+   "size" : 32,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20931,16 +20440,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "const bssl::Span<const SignatureAlgorithmName>",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIKN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_10NamedGroupEEE",
    "name" : "const bssl::Span<const bssl::NamedGroup>",
    "referenced_type" : "_ZTIN4bssl4SpanIKNS_10NamedGroupEEE",
@@ -20951,26 +20450,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "const bssl::Span<const bssl::VersionInfo>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "name" : "const bssl::Span<const char *const>",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIKbEE",
    "name" : "const bssl::Span<const bool>",
    "referenced_type" : "_ZTIN4bssl4SpanIKbEE",
@@ -21021,16 +20500,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN4bssl4SpanIPKcEE",
-   "name" : "const bssl::Span<const char *>",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIKN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIKN4bssl4SpanIhEE",
    "name" : "const bssl::Span<unsigned char>",
    "referenced_type" : "_ZTIN4bssl4SpanIhEE",
@@ -21075,7 +20544,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" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22864,7 +22333,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4544,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22872,7 +22341,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22900,22 +22369,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4672,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4864,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5376,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5440,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22923,7 +22392,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23689,7 +23158,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA564_h"
+     "referenced_type" : "_ZTIA580_h"
     },
     {
      "field_name" : "alignment",
@@ -23701,7 +23170,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 564,
+   "size" : 580,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -24028,6 +23497,249 @@
    "fields" :
    [
     {
+     "field_name" : "version",
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "field_name" : "p",
+     "field_offset" : 32,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "q",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "g",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "pub_key",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "priv_key",
+     "field_offset" : 160,
+     "referenced_type" : "_ZTIP9bignum_st"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "field_name" : "method_mont_lock",
+     "field_offset" : 224,
+     "referenced_type" : "_ZTI16pthread_rwlock_t"
+    },
+    {
+     "field_name" : "method_mont_p",
+     "field_offset" : 544,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "method_mont_q",
+     "field_offset" : 576,
+     "referenced_type" : "_ZTIP14bn_mont_ctx_st"
+    },
+    {
+     "field_name" : "references",
+     "field_offset" : 608,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "field_name" : "ex_data",
+     "field_offset" : 640,
+     "referenced_type" : "_ZTI17crypto_ex_data_st"
+    }
+   ],
+   "linker_set_key" : "_ZTI6dsa_st",
+   "name" : "dsa_st",
+   "referenced_type" : "_ZTI6dsa_st",
+   "self_type" : "_ZTI6dsa_st",
+   "size" : 84,
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
+  },
+  {
+   "alignment" : 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"
     },
@@ -24436,41 +24148,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPK22SignatureAlgorithmName"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::Span<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl4SpanIK22SignatureAlgorithmNameEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE"
     }
    ],
@@ -24506,76 +24183,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKN4bssl11VersionInfoE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "name" : "bssl::Span<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl4SpanIKNS_11VersionInfoEEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPKPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIKPKcEE",
-   "name" : "bssl::Span<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIKPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKbEE"
     }
    ],
@@ -24751,41 +24358,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "data_",
-     "referenced_type" : "_ZTIPPKc"
-    },
-    {
-     "access" : "private",
-     "field_name" : "size_",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "linker_set_key" : "_ZTIN4bssl4SpanIPKcEE",
-   "name" : "bssl::Span<const char *>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "self_type" : "_ZTIN4bssl4SpanIPKcEE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIPKc"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKhEE"
     }
    ],
@@ -26471,7 +26043,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" : 572,
+   "size" : 588,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26494,7 +26066,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" : 684,
+   "size" : 700,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26759,20 +26331,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "name" : "bssl::internal::SpanBase<const SignatureAlgorithmName>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIK22SignatureAlgorithmNameEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIK22SignatureAlgorithmName"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_10NamedGroupEEE",
    "name" : "bssl::internal::SpanBase<const bssl::NamedGroup>",
    "record_kind" : "class",
@@ -26787,34 +26345,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "name" : "bssl::internal::SpanBase<const bssl::VersionInfo>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKNS_11VersionInfoEEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKN4bssl11VersionInfoE"
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "name" : "bssl::internal::SpanBase<const char *const>",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "self_type" : "_ZTIN4bssl8internal8SpanBaseIKPKcEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/span.h",
-   "template_args" :
-   [
-    "_ZTIKPKc"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal8SpanBaseIKbEE",
    "name" : "bssl::internal::SpanBase<const bool>",
    "record_kind" : "class",
diff --git a/34/64/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 5384ba92..0547276f 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" : 28,
+   "size" : 24,
    "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" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6733,19 +6733,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_019BufferStatusMessageELNS1_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6836,19 +6830,13 @@
      "field_name" : "mEventFlag",
      "field_offset" : 160,
      "referenced_type" : "_ZTIPN7android8hardware9EventFlagE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "kPageSize",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIKj"
     }
    ],
    "linker_set_key" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "name" : "android::MessageQueueBase<android::hardware::MQDescriptor, android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android16MessageQueueBaseINS_8hardware12MQDescriptorENS1_5media10bufferpool4V2_025BufferInvalidationMessageELNS1_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9111,7 +9099,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9130,7 +9118,7 @@
    "name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>",
    "referenced_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
    "self_type" : "_ZTIN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEE",
-   "size" : 28,
+   "size" : 24,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 3435ed8f..b57d79e6 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,9 +981,6 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
-   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -11703,11 +11700,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12294,11 +12291,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12879,11 +12876,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14476,37 +14473,6 @@
   },
   {
    "function_name" : "android::GraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android19GraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_16ComponentWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::GraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy",
    "parameters" :
    [
diff --git a/34/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
index ee3451a7..484758ab 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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_x86_64_static/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_x86_64_static/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_x86_64_static/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 3e7f5265..64ac504f 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,9 +642,6 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
-   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
-  },
-  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -15371,37 +15368,6 @@
   },
   {
    "function_name" : "android::OmxGraphicBufferSource::configure",
-   "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android22OmxGraphicBufferSourceE"
-    },
-    {
-     "referenced_type" : "_ZTIRKN7android2spINS_15IOmxNodeWrapperEEE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h"
-  },
-  {
-   "function_name" : "android::OmxGraphicBufferSource::configure",
    "linker_set_key" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy",
    "parameters" :
    [
@@ -43281,15 +43247,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTION7android2spINS_5FenceEEE",
-   "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "_ZTIN7android2spINS_5FenceEEE",
-   "self_type" : "_ZTION7android2spINS_5FenceEEE",
-   "size" : 4,
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTION7android2spINS_7ABufferEEE",
    "name" : "android::sp<android::ABuffer> &&",
    "referenced_type" : "_ZTIN7android2spINS_7ABufferEEE",
diff --git a/34/64/x86_x86_64/source-based/libstagefright_omx_utils.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_omx_utils.so.lsdump
index 924b2206..ecf2ee5b 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" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24585,12 +24585,6 @@
     },
     {
      "access" : "private",
-     "field_name" : "mServiceFuzzing",
-     "field_offset" : 408,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
diff --git a/34/64/x86_x86_64/source-based/libtinyalsa.so.lsdump b/34/64/x86_x86_64/source-based/libtinyalsa.so.lsdump
index 4aa00794..6822d0d1 100644
--- a/34/64/x86_x86_64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libtinyalsa.so.lsdump
@@ -218,9 +218,6 @@
    "name" : "pcm_get_subdevice"
   },
   {
-   "name" : "pcm_get_xruns"
-  },
-  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1301,18 +1298,6 @@
    "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
   },
   {
-   "function_name" : "pcm_get_xruns",
-   "linker_set_key" : "pcm_get_xruns",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP3pcm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/tinyalsa/include/tinyalsa/asoundlib.h"
-  },
-  {
    "function_name" : "pcm_ioctl",
    "linker_set_key" : "pcm_ioctl",
    "parameters" :
diff --git a/34/64/x86_x86_64/source-based/libui.so.lsdump b/34/64/x86_x86_64/source-based/libui.so.lsdump
index f08d4552..882bcdfe 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_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -859,6 +859,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -867,10 +871,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1201,10 +1213,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1445,6 +1453,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1453,9 +1465,21 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS9_8hidl_vecIhEEPT_ESS_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperINSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS2_9allocatorIS9_EEEEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS8_20StandardMetadataTypeEPFiRKNSD_8hidl_vecIhEEPT_ESR_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIjEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIyEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpEN4aidl7android8hardware8graphics6common20StandardMetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper18validateBufferSizeEPK13native_handlejjijyj"
   },
   {
@@ -1483,6 +1507,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1499,6 +1527,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1518,6 +1550,10 @@
    "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalIN4aidl7android8hardware8graphics6common9Smpte2086EEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSO_PNSE_8hidl_vecIhEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNK7android14Gralloc4Mapper3setINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeERKT_PFiSM_PNSC_8hidl_vecIhEEE"
+  },
+  {
    "name" : "_ZNK7android14Gralloc4Mapper4lockEPK13native_handleyRKNS_4RectEiP13android_ycbcr"
   },
   {
@@ -2306,6 +2342,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE14__erase_uniqueIS4_EEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_EEE25__emplace_unique_key_argsIS4_JRKNS_21piecewise_construct_tENS_5tupleIJOS4_EEENSR_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeISC_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -2334,6 +2374,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2342,15 +2386,31 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113__vector_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIiNS_9allocatorIiEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__113unordered_mapIPN7android5FenceENS_6vectorINS_8weak_ptrINS1_9FenceTimeEEENS_9allocatorIS7_EEEENS_4hashIS3_EENS_8equal_toIS3_EENS8_INS_4pairIKS3_SA_EEEEEixEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common11PlaneLayoutERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -2358,6 +2418,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEEC2EjjS9_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvyEEES3_EERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -2382,6 +2450,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2430,14 +2502,30 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN3ndk20ScopedFileDescriptorENS_9allocatorIS2_EEEC2Ej"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware6common12NativeHandleENS_9allocatorIS5_EEE13__vdeallocateEv"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
@@ -2450,10 +2538,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common11PlaneLayoutENS_9allocatorIS6_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE13__vdeallocateEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE24__emplace_back_slow_pathIJEEEvDpOT_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEE6assignIPS6_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS6_NS_15iterator_traitsISD_E9referenceEEE5valueEvE4typeESD_SD_"
   },
   {
@@ -2462,11 +2566,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
   },
   {
    "binding" : "weak",
@@ -2482,6 +2590,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android4RectENS1_18InlineStdAllocatorIS2_Lj4EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS2_RS4_EEPS2_"
   },
   {
@@ -2502,6 +2614,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEE18__construct_at_endEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android8hardware8graphics6mapper4V4_07IMapper23MetadataTypeDescriptionENS_9allocatorIS7_EEEC2Ej"
   },
   {
@@ -2510,6 +2630,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_4pairINS_8functionIFvPvyEEES3_EENS_9allocatorIS6_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS8_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE21__push_back_slow_pathIS4_EEvOT_"
   },
   {
@@ -2518,6 +2642,14 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5eraseENS_11__wrap_iterIPKS4_EESB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS3_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhN7android18InlineStdAllocatorIhLj128EEEE6resizeEj"
   },
   {
@@ -2530,10 +2662,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE26__swap_out_circular_bufferERNS_14__split_bufferIhRS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPKhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS8_E9referenceEEE5valueEvE4typeES8_S8_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6resizeEj"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
   },
   {
@@ -2542,6 +2690,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEEC2Ej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE11__vallocateEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEE13__move_assignERS3_NS_17integral_constantIbLb1EEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIiNS_9allocatorIiEEEC2IPKiEET_NS_9enable_ifIXaasr21__is_forward_iteratorIS7_EE5valuesr16is_constructibleIiNS_15iterator_traitsIS7_E9referenceEEE5valueES7_E4typeE"
   },
   {
@@ -3863,7 +4023,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4292870143,
+     "enum_field_value" : -2097153,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -3879,11 +4039,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -3892,7 +4052,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4084,7 +4244,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4100,71 +4260,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 281474976710656,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 562949953421312,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 1125899906842624,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 2251799813685248,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 4503599627370496,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 9007199254740992,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 18014398509481984,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 36028797018963968,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 72057594037927936,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 144115188075855872,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 288230376151711744,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 576460752303423488,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 1152921504606846976,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 2305843009213693952,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 4611686018427387904,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 9223372036854775808,
+     "enum_field_value" : 0,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4484,7 +4644,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 4294967296,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4492,7 +4652,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : -281474976710656,
+     "enum_field_value" : 0,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7254,7 +7414,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 2147483648,
+     "enum_field_value" : -2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8236,11 +8396,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8827,11 +8987,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9412,11 +9572,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : 4026531840,
+     "enum_field_value" : -268435456,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 18446462598732840960,
+     "enum_field_value" : 0,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10728,7 +10888,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10746,7 +10906,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10779,7 +10939,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10794,7 +10954,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10812,7 +10972,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10830,7 +10990,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10857,7 +11017,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10902,7 +11062,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10920,7 +11080,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10941,7 +11101,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10965,7 +11125,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11001,7 +11161,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11040,7 +11200,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11076,7 +11236,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11115,7 +11275,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11148,7 +11308,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11166,7 +11326,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11202,7 +11362,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11223,7 +11383,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14369,6 +14529,19 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/PublicFormat.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::clear",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_5FenceEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::Fence>::~sp",
    "linker_set_key" : "_ZN7android2spINS_5FenceEED2Ev",
    "parameters" :
@@ -14398,6 +14571,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_",
    "parameters" :
@@ -14414,6 +14603,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::graphics::mapper::V4_0::IMapper>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_",
    "parameters" :
@@ -16096,12 +16301,6 @@
    "source_file" : "frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
-   "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
-   "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "_ZTIRN7android22GraphicBufferAllocatorE",
-   "source_file" : "system/core/libutils/include/utils/Singleton.h"
-  },
-  {
    "function_name" : "android::parseEdid",
    "linker_set_key" : "_ZN7android9parseEdidERKNSt3__16vectorIhNS0_9allocatorIhEEEE",
    "parameters" :
@@ -22019,7 +22218,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22028,7 +22227,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22073,7 +22272,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22109,7 +22308,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22118,7 +22317,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22208,7 +22407,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22217,7 +22416,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22226,7 +22425,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22235,7 +22434,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22244,7 +22443,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22253,7 +22452,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22262,7 +22461,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22280,7 +22479,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22289,7 +22488,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22298,7 +22497,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22307,7 +22506,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22316,7 +22515,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22325,7 +22524,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22334,7 +22533,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22343,7 +22542,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22352,7 +22551,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22361,7 +22560,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22379,7 +22578,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22388,7 +22587,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22415,7 +22614,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22442,7 +22641,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25367,7 +25566,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25498,7 +25697,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25536,7 +25735,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28073,7 +28272,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28129,7 +28328,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28293,7 +28492,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28390,7 +28589,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28549,7 +28748,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28737,7 +28936,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump b/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump
index 096baf48..3c0d835b 100644
--- a/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump
@@ -102,6 +102,24 @@
   },
   {
    "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",
@@ -229,367 +247,400 @@
    "name" : "AsmGetRegs"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
+   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
+   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
+   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
+   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
+   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
+   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
+   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
-   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
   },
   {
-   "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
+   "name" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips642spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips644ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips645CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips646set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack10RegsMips64C2Ev"
   },
   {
    "name" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE"
@@ -2480,6 +2531,45 @@
    "name" : "_ZN11unwindstack8MemoryXzD2Ev"
   },
   {
+   "name" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2pcEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips2spEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ArchEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips4ReadEPv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips5CloneEv"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_pcEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMips6set_spEy"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC1Ev"
+  },
+  {
+   "name" : "_ZN11unwindstack8RegsMipsC2Ev"
+  },
+  {
    "name" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy"
   },
   {
@@ -3216,13 +3306,10 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
-  },
-  {
-   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
+   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
   },
   {
    "binding" : "weak",
@@ -3291,6 +3378,9 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
+   "name" : "_ZTVN11unwindstack10RegsMips64E"
+  },
+  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3482,6 +3572,9 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
+   "name" : "_ZTVN11unwindstack8RegsMipsE"
+  },
+  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3545,9 +3638,6 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
-  },
-  {
-   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3719,6 +3809,48 @@
    "underlying_type" : "_ZTIy"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS32_EF_R0"
+    },
+    {
+     "enum_field_value" : 40,
+     "name" : "unwindstack::MIPS32_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "name" : "unwindstack::Mips32UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips32UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_EF_R0"
+    },
+    {
+     "enum_field_value" : 34,
+     "name" : "unwindstack::MIPS64_EF_CP0_EPC"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "name" : "unwindstack::Mips64UserReg",
+   "referenced_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "self_type" : "_ZTIN11unwindstack13Mips64UserRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4049,6 +4181,163 @@
    "underlying_type" : "_ZTIt"
   },
   {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack7MipsRegE",
+   "name" : "unwindstack::MipsReg",
+   "referenced_type" : "_ZTIN11unwindstack7MipsRegE",
+   "self_type" : "_ZTIN11unwindstack7MipsRegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
    "alignment" : 1,
    "enum_fields" :
    [
@@ -4074,6 +4363,14 @@
     },
     {
      "enum_field_value" : 5,
+     "name" : "unwindstack::ARCH_MIPS"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::ARCH_MIPS64"
+    },
+    {
+     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4341,6 +4638,163 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "unwindstack::MIPS64_REG_R0"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "unwindstack::MIPS64_REG_R1"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "unwindstack::MIPS64_REG_R2"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "unwindstack::MIPS64_REG_R3"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "unwindstack::MIPS64_REG_R4"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "unwindstack::MIPS64_REG_R5"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "unwindstack::MIPS64_REG_R6"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "unwindstack::MIPS64_REG_R7"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "unwindstack::MIPS64_REG_R8"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "unwindstack::MIPS64_REG_R9"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "unwindstack::MIPS64_REG_R10"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "unwindstack::MIPS64_REG_R11"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "unwindstack::MIPS64_REG_R12"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "unwindstack::MIPS64_REG_R13"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "unwindstack::MIPS64_REG_R14"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "unwindstack::MIPS64_REG_R15"
+    },
+    {
+     "enum_field_value" : 16,
+     "name" : "unwindstack::MIPS64_REG_R16"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "unwindstack::MIPS64_REG_R17"
+    },
+    {
+     "enum_field_value" : 18,
+     "name" : "unwindstack::MIPS64_REG_R18"
+    },
+    {
+     "enum_field_value" : 19,
+     "name" : "unwindstack::MIPS64_REG_R19"
+    },
+    {
+     "enum_field_value" : 20,
+     "name" : "unwindstack::MIPS64_REG_R20"
+    },
+    {
+     "enum_field_value" : 21,
+     "name" : "unwindstack::MIPS64_REG_R21"
+    },
+    {
+     "enum_field_value" : 22,
+     "name" : "unwindstack::MIPS64_REG_R22"
+    },
+    {
+     "enum_field_value" : 23,
+     "name" : "unwindstack::MIPS64_REG_R23"
+    },
+    {
+     "enum_field_value" : 24,
+     "name" : "unwindstack::MIPS64_REG_R24"
+    },
+    {
+     "enum_field_value" : 25,
+     "name" : "unwindstack::MIPS64_REG_R25"
+    },
+    {
+     "enum_field_value" : 26,
+     "name" : "unwindstack::MIPS64_REG_R26"
+    },
+    {
+     "enum_field_value" : 27,
+     "name" : "unwindstack::MIPS64_REG_R27"
+    },
+    {
+     "enum_field_value" : 28,
+     "name" : "unwindstack::MIPS64_REG_R28"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_R29"
+    },
+    {
+     "enum_field_value" : 30,
+     "name" : "unwindstack::MIPS64_REG_R30"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_R31"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "unwindstack::MIPS64_REG_PC"
+    },
+    {
+     "enum_field_value" : 33,
+     "name" : "unwindstack::MIPS64_REG_LAST"
+    },
+    {
+     "enum_field_value" : 29,
+     "name" : "unwindstack::MIPS64_REG_SP"
+    },
+    {
+     "enum_field_value" : 31,
+     "name" : "unwindstack::MIPS64_REG_RA"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack9Mips64RegE",
+   "name" : "unwindstack::Mips64Reg",
+   "referenced_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "self_type" : "_ZTIN11unwindstack9Mips64RegE",
+   "size" : 2,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/MachineMips64.h",
+   "underlying_type" : "_ZTIt"
+  },
+  {
+   "alignment" : 2,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "unwindstack::X86_64_REG_RAX"
     },
     {
@@ -4446,6 +4900,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/Maps.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips64::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6418CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6419StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips6422SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips642spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Arch",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Read",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips644ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::Clone",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips645CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_pc",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::set_sp",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips646set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips64::RegsMips64",
+   "linker_set_key" : "_ZN11unwindstack10RegsMips64C2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack10RegsMips64E"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
    "function_name" : "unwindstack::RegsX86_64::SetFromUcontext",
    "linker_set_key" : "_ZN11unwindstack10RegsX86_6415SetFromUcontextEPNS_17x86_64_ucontext_tE",
    "parameters" :
@@ -7177,6 +7819,194 @@
    "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsX86.h"
   },
   {
+   "function_name" : "unwindstack::RegsMips::IterateRegisters",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips16IterateRegistersENSt3__18functionIFvPKcyEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTINSt3__18functionIFvPKcyEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::CreateFromUcontext",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips18CreateFromUcontextEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::StepIfSignalHandler",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips19StepIfSignalHandlerEyPNS_3ElfEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack3ElfE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::SetPcFromReturnAddress",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips22SetPcFromReturnAddressEPNS_6MemoryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIPN11unwindstack6MemoryE"
+    }
+   ],
+   "return_type" : "_ZTIb",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2pcEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips2spEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIy",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Arch",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ArchEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIN11unwindstack8ArchEnumE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Read",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips4ReadEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::Clone",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips5CloneEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIPN11unwindstack4RegsE",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_pc",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_pcEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::set_sp",
+   "linker_set_key" : "_ZN11unwindstack8RegsMips6set_spEy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    },
+    {
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "function_name" : "unwindstack::RegsMips::RegsMips",
+   "linker_set_key" : "_ZN11unwindstack8RegsMipsC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN11unwindstack8RegsMipsE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "unwindstack::Unwinder::FillInFrame",
    "linker_set_key" : "_ZN11unwindstack8Unwinder11FillInFrameERNSt3__110shared_ptrINS_7MapInfoEEEPNS_3ElfEyy",
@@ -8109,6 +8939,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack10RegsMips64E",
+   "name" : "unwindstack::RegsMips64 *",
+   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
+   "self_type" : "_ZTIPN11unwindstack10RegsMips64E",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips64.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64 *",
    "referenced_type" : "_ZTIN11unwindstack10RegsX86_64E",
@@ -8469,6 +9308,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN11unwindstack8RegsMipsE",
+   "name" : "unwindstack::RegsMips *",
+   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
+   "self_type" : "_ZTIPN11unwindstack8RegsMipsE",
+   "size" : 4,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/RegsMips.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN11unwindstack8UnwinderE",
    "name" : "unwindstack::Unwinder *",
    "referenced_type" : "_ZTIN11unwindstack8UnwinderE",
@@ -8985,6 +9833,82 @@
      "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",
@@ -9712,6 +10636,32 @@
    "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"
     },
@@ -10054,6 +11004,48 @@
      "referenced_type" : "_ZTIy"
     },
     {
+     "field_name" : "ss_size",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "ss_flags",
+     "field_offset" : 128,
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "name" : "unwindstack::mips64_stack_t",
+   "referenced_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "self_type" : "_ZTIN11unwindstack14mips64_stack_tE",
+   "size" : 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"
@@ -10447,6 +11439,68 @@
   },
   {
    "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" :
    [
     {
@@ -10849,6 +11903,22 @@
    "fields" :
    [
     {
+     "field_name" : "regs",
+     "referenced_type" : "_ZTIA45_y"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "name" : "unwindstack::mips64_user_regs",
+   "referenced_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "self_type" : "_ZTIN11unwindstack16mips64_user_regsE",
+   "size" : 360,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UserMips64.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIy"
     }
@@ -11011,6 +12081,103 @@
    "fields" :
    [
     {
+     "field_name" : "sc_regs",
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_fpregs",
+     "field_offset" : 2048,
+     "referenced_type" : "_ZTIA32_y"
+    },
+    {
+     "field_name" : "sc_mdhi",
+     "field_offset" : 4096,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi1",
+     "field_offset" : 4160,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi2",
+     "field_offset" : 4224,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_hi3",
+     "field_offset" : 4288,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_mdlo",
+     "field_offset" : 4352,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo1",
+     "field_offset" : 4416,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo2",
+     "field_offset" : 4480,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_lo3",
+     "field_offset" : 4544,
+     "referenced_type" : "_ZTIy"
+    },
+    {
+     "field_name" : "sc_pc",
+     "field_offset" : 4608,
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "linker_set_key" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "name" : "unwindstack::mips64_mcontext_t",
+   "referenced_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "self_type" : "_ZTIN11unwindstack17mips64_mcontext_tE",
+   "size" : 584,
+   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
+  },
+  {
+   "alignment" : 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"
     }
@@ -12594,6 +13761,82 @@
   },
   {
    "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 808b3aca..9f63b0c1 100644
--- a/34/64/x86_x86_64/source-based/libutils.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libutils.so.lsdump
@@ -492,6 +492,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -503,6 +507,10 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
+  },
+  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -737,6 +745,9 @@
    "name" : "_ZN7android7String813appendFormatVEPKcPc"
   },
   {
+   "name" : "_ZN7android7String816convertToResPathEv"
+  },
+  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1215,6 +1226,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIiJRiRKyEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
   },
   {
@@ -1239,6 +1254,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIiyEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE14__erase_uniqueIyEEjRKT_"
   },
   {
@@ -1251,6 +1270,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE4findIyEENS_15__hash_iteratorIPNS_11__hash_nodeIS5_PvEEEERKT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIyN7android6Looper7RequestEEENS_22__unordered_map_hasherIyS5_NS_4hashIyEELb1EEENS_21__unordered_map_equalIyS5_NS_8equal_toIyEELb1EEENS_9allocatorIS5_EEE5eraseENS_21__hash_const_iteratorIPNS_11__hash_nodeIS5_PvEEEE"
   },
   {
@@ -5740,6 +5763,19 @@
    "source_file" : "system/core/libutils/include/utils/misc.h"
   },
   {
+   "function_name" : "android::sp<android::LooperCallback>::clear",
+   "linker_set_key" : "_ZN7android2spINS_14LooperCallbackEE5clearEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_14LooperCallbackEEE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::SimpleLooperCallback>::operator=",
    "linker_set_key" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_",
    "parameters" :
@@ -5785,6 +5821,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::Thread>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_6ThreadEEaSEOS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_6ThreadEEE"
+    },
+    {
+     "referenced_type" : "_ZTION7android2spINS_6ThreadEEE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_6ThreadEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::LightRefBase_reportIncStrongRequireStrongFailed",
    "linker_set_key" : "_ZN7android47LightRefBase_reportIncStrongRequireStrongFailedEPKv",
    "parameters" :
@@ -7015,6 +7067,19 @@
    "source_file" : "system/core/libutils/include/utils/String8.h"
   },
   {
+   "function_name" : "android::String8::convertToResPath",
+   "linker_set_key" : "_ZN7android7String816convertToResPathEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android7String8E"
+    }
+   ],
+   "return_type" : "_ZTIRN7android7String8E",
+   "source_file" : "system/core/libutils/include/utils/String8.h"
+  },
+  {
    "function_name" : "android::String8::clear",
    "linker_set_key" : "_ZN7android7String85clearEv",
    "parameters" :
diff --git a/34/64/x86_x86_64/source-based/libxml2.so.lsdump b/34/64/x86_x86_64/source-based/libxml2.so.lsdump
index c4eaf143..243219ca 100644
--- a/34/64/x86_x86_64/source-based/libxml2.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libxml2.so.lsdump
@@ -718,9 +718,6 @@
    "name" : "xmlCtxtResetPush"
   },
   {
-   "name" : "xmlCtxtSetMaxAmplification"
-  },
-  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1405,9 +1402,6 @@
    "name" : "xmlMemShow"
   },
   {
-   "name" : "xmlMemSize"
-  },
-  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1921,9 +1915,6 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
-   "name" : "xmlParserInputBufferCreateString"
-  },
-  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3010,9 +3001,6 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
-   "name" : "xmlTextReaderSetMaxAmplification"
-  },
-  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5401,43 +5389,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
-     "name" : "XML_ENC_ERR_SUCCESS"
-    },
-    {
-     "enum_field_value" : -1,
-     "name" : "XML_ENC_ERR_SPACE"
-    },
-    {
-     "enum_field_value" : -2,
-     "name" : "XML_ENC_ERR_INPUT"
-    },
-    {
-     "enum_field_value" : -3,
-     "name" : "XML_ENC_ERR_PARTIAL"
-    },
-    {
-     "enum_field_value" : -4,
-     "name" : "XML_ENC_ERR_INTERNAL"
-    },
-    {
-     "enum_field_value" : -5,
-     "name" : "XML_ENC_ERR_MEMORY"
-    }
-   ],
-   "linker_set_key" : "_ZTI15xmlCharEncError",
-   "name" : "xmlCharEncError",
-   "referenced_type" : "_ZTI15xmlCharEncError",
-   "self_type" : "_ZTI15xmlCharEncError",
-   "size" : 4,
-   "source_file" : "external/libxml2/include/libxml/encoding.h",
-   "underlying_type" : "_ZTIi"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : -1,
      "name" : "XML_CHAR_ENCODING_ERROR"
     },
@@ -6020,10 +5971,6 @@
      "name" : "XML_ERR_COMMENT_ABRUPTLY_ENDED"
     },
     {
-     "enum_field_value" : 113,
-     "name" : "XML_WAR_ENCODING_MISMATCH"
-    },
-    {
      "enum_field_value" : 200,
      "name" : "XML_NS_ERR_XML_NAMESPACE"
     },
@@ -9543,10 +9490,6 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -14027,21 +13970,6 @@
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
-   "function_name" : "xmlCtxtSetMaxAmplification",
-   "linker_set_key" : "xmlCtxtSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlParserCtxt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/parser.h"
-  },
-  {
    "function_name" : "xmlCtxtUseOptions",
    "linker_set_key" : "xmlCtxtUseOptions",
    "parameters" :
@@ -17291,18 +17219,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
   },
   {
-   "function_name" : "xmlMemSize",
-   "linker_set_key" : "xmlMemSize",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/libxml2/include/libxml/xmlmemory.h"
-  },
-  {
    "function_name" : "xmlMemStrdupLoc",
    "linker_set_key" : "xmlMemStrdupLoc",
    "parameters" :
@@ -19826,18 +19742,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlIO.h"
   },
   {
-   "function_name" : "xmlParserInputBufferCreateString",
-   "linker_set_key" : "xmlParserInputBufferCreateString",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    }
-   ],
-   "return_type" : "_ZTIP21_xmlParserInputBuffer",
-   "source_file" : "external/libxml2/include/private/io.h"
-  },
-  {
    "function_name" : "xmlParserInputBufferGrow",
    "linker_set_key" : "xmlParserInputBufferGrow",
    "parameters" :
@@ -22714,7 +22618,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIi",
+   "return_type" : "_ZTIv",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25502,21 +25406,6 @@
    "source_file" : "external/libxml2/include/libxml/xmlreader.h"
   },
   {
-   "function_name" : "xmlTextReaderSetMaxAmplification",
-   "linker_set_key" : "xmlTextReaderSetMaxAmplification",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP14_xmlTextReader"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libxml2/include/libxml/xmlreader.h"
-  },
-  {
    "function_name" : "xmlTextReaderSetParserProp",
    "linker_set_key" : "xmlTextReaderSetParserProp",
    "parameters" :
@@ -35400,18 +35289,13 @@
      "field_name" : "nbWarnings",
      "field_offset" : 3824,
      "referenced_type" : "_ZTIt"
-    },
-    {
-     "field_name" : "maxAmpl",
-     "field_offset" : 3840,
-     "referenced_type" : "_ZTIj"
     }
    ],
    "linker_set_key" : "_ZTI14_xmlParserCtxt",
    "name" : "_xmlParserCtxt",
    "referenced_type" : "_ZTI14_xmlParserCtxt",
    "self_type" : "_ZTI14_xmlParserCtxt",
-   "size" : 484,
+   "size" : 480,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -36095,7 +35979,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "flags",
+     "field_name" : "standalone",
      "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 63d04172..37f583d9 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/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -17,7 +17,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 1,
@@ -26,7 +26,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA32_h",
    "size" : 32,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -175,36 +175,12 @@
    "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"
   },
   {
@@ -220,21 +196,6 @@
    "name" : "ABGRToUVRow_SSSE3"
   },
   {
-   "name" : "ABGRToYJRow_AVX2"
-  },
-  {
-   "name" : "ABGRToYJRow_Any_AVX2"
-  },
-  {
-   "name" : "ABGRToYJRow_Any_SSSE3"
-  },
-  {
-   "name" : "ABGRToYJRow_C"
-  },
-  {
-   "name" : "ABGRToYJRow_SSSE3"
-  },
-  {
    "name" : "ABGRToYRow_AVX2"
   },
   {
@@ -724,9 +685,6 @@
    "name" : "ARGBToI420"
   },
   {
-   "name" : "ARGBToI420Alpha"
-  },
-  {
    "name" : "ARGBToI422"
   },
   {
@@ -1114,24 +1072,6 @@
    "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"
   },
   {
@@ -1153,18 +1093,6 @@
    "name" : "DetileSplitUVRow_SSSE3"
   },
   {
-   "name" : "DetileToYUY2"
-  },
-  {
-   "name" : "DetileToYUY2_Any_SSE2"
-  },
-  {
-   "name" : "DetileToYUY2_C"
-  },
-  {
-   "name" : "DetileToYUY2_SSE2"
-  },
-  {
    "name" : "DivideRow_16_AVX2"
   },
   {
@@ -1204,6 +1132,9 @@
    "name" : "GetARGBBlend"
   },
   {
+   "name" : "GetXCR0"
+  },
+  {
    "name" : "H010ToAB30"
   },
   {
@@ -1321,9 +1252,6 @@
    "name" : "I010Copy"
   },
   {
-   "name" : "I010Rotate"
-  },
-  {
    "name" : "I010ToAB30"
   },
   {
@@ -1381,9 +1309,6 @@
    "name" : "I210Copy"
   },
   {
-   "name" : "I210Rotate"
-  },
-  {
    "name" : "I210ToAB30"
   },
   {
@@ -1483,9 +1408,6 @@
    "name" : "I212ToARGBRow_SSSE3"
   },
   {
-   "name" : "I212ToI420"
-  },
-  {
    "name" : "I212ToI422"
   },
   {
@@ -1534,12 +1456,6 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
-   "name" : "I410Copy"
-  },
-  {
-   "name" : "I410Rotate"
-  },
-  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1579,15 +1495,9 @@
    "name" : "I410ToI010"
   },
   {
-   "name" : "I410ToI420"
-  },
-  {
    "name" : "I410ToI444"
   },
   {
-   "name" : "I412ToI420"
-  },
-  {
    "name" : "I412ToI444"
   },
   {
@@ -1696,9 +1606,6 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
-   "name" : "I420ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1849,18 +1756,6 @@
    "name" : "I422ToNV21"
   },
   {
-   "name" : "I422ToRAW"
-  },
-  {
-   "name" : "I422ToRGB24"
-  },
-  {
-   "name" : "I422ToRGB24Matrix"
-  },
-  {
-   "name" : "I422ToRGB24MatrixFilter"
-  },
-  {
    "name" : "I422ToRGB24Row_AVX2"
   },
   {
@@ -1879,9 +1774,6 @@
    "name" : "I422ToRGB565"
   },
   {
-   "name" : "I422ToRGB565Matrix"
-  },
-  {
    "name" : "I422ToRGB565Row_AVX2"
   },
   {
@@ -2026,30 +1918,6 @@
    "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"
   },
   {
@@ -2146,12 +2014,6 @@
    "name" : "MM21ToNV12"
   },
   {
-   "name" : "MM21ToYUY2"
-  },
-  {
-   "name" : "MT2TToP010"
-  },
-  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -2182,6 +2044,12 @@
    "name" : "MergeARGBPlane"
   },
   {
+   "name" : "MergeARGBPlaneAlpha"
+  },
+  {
+   "name" : "MergeARGBPlaneOpaque"
+  },
+  {
    "name" : "MergeARGBRow_AVX2"
   },
   {
@@ -2227,15 +2095,9 @@
    "name" : "MergeUVRow_AVX2"
   },
   {
-   "name" : "MergeUVRow_AVX512BW"
-  },
-  {
    "name" : "MergeUVRow_Any_AVX2"
   },
   {
-   "name" : "MergeUVRow_Any_AVX512BW"
-  },
-  {
    "name" : "MergeUVRow_Any_SSE2"
   },
   {
@@ -2296,9 +2158,6 @@
    "name" : "MirrorPlane"
   },
   {
-   "name" : "MirrorRow_16_C"
-  },
-  {
    "name" : "MirrorRow_AVX2"
   },
   {
@@ -2524,15 +2383,9 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
-   "name" : "P010ToI010"
-  },
-  {
    "name" : "P010ToP410"
   },
   {
-   "name" : "P012ToI012"
-  },
-  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2818,9 +2671,6 @@
    "name" : "RGBScale"
   },
   {
-   "name" : "RiscvCpuCaps"
-  },
-  {
    "name" : "RotatePlane"
   },
   {
@@ -2833,9 +2683,6 @@
    "name" : "RotatePlane90"
   },
   {
-   "name" : "RotatePlane_16"
-  },
-  {
    "name" : "Scale"
   },
   {
@@ -2977,9 +2824,6 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
-   "name" : "ScalePlaneDown2_16To8"
-  },
-  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -3013,12 +2857,6 @@
    "name" : "ScalePlane_16"
   },
   {
-   "name" : "ScaleRowDown2Box_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Box_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -3046,12 +2884,6 @@
    "name" : "ScaleRowDown2Box_SSSE3"
   },
   {
-   "name" : "ScaleRowDown2Linear_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -3070,12 +2902,6 @@
    "name" : "ScaleRowDown2Linear_SSSE3"
   },
   {
-   "name" : "ScaleRowDown2_16To8_C"
-  },
-  {
-   "name" : "ScaleRowDown2_16To8_Odd_C"
-  },
-  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -3505,6 +3331,12 @@
    "name" : "SplitARGBPlane"
   },
   {
+   "name" : "SplitARGBPlaneAlpha"
+  },
+  {
+   "name" : "SplitARGBPlaneOpaque"
+  },
+  {
    "name" : "SplitARGBRow_AVX2"
   },
   {
@@ -3631,33 +3463,15 @@
    "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"
   },
   {
@@ -3667,9 +3481,6 @@
    "name" : "TransposeWx8_SSSE3"
   },
   {
-   "name" : "TransposeWxH_16_C"
-  },
-  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3796,9 +3607,6 @@
    "name" : "UYVYToYRow_SSE2"
   },
   {
-   "name" : "UnpackMT2T_C"
-  },
-  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3832,21 +3640,6 @@
    "name" : "YUY2ToNV12"
   },
   {
-   "name" : "YUY2ToNVUVRow_AVX2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_Any_AVX2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_Any_SSE2"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_C"
-  },
-  {
-   "name" : "YUY2ToNVUVRow_SSE2"
-  },
-  {
    "name" : "YUY2ToUV422Row_AVX2"
   },
   {
@@ -4088,7 +3881,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4129,7 +3922,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4162,7 +3955,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4475,7 +4268,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4724,7 +4517,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4752,7 +4545,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4776,7 +4569,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4806,7 +4599,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_AVX2",
@@ -4824,7 +4617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_AVX2",
@@ -4842,7 +4635,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_SSSE3",
@@ -4860,7 +4653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4878,7 +4671,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_SSSE3",
@@ -4896,7 +4689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4923,7 +4716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_AVX2",
@@ -4941,7 +4734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_AVX2",
@@ -4959,7 +4752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_SSSE3",
@@ -4977,7 +4770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4995,7 +4788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_SSSE3",
@@ -5013,7 +4806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -5040,7 +4833,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -5079,112 +4872,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ400",
-   "linker_set_key" : "ABGRToJ400",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ420",
-   "linker_set_key" : "ABGRToJ420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::ABGRToJ422",
-   "linker_set_key" : "ABGRToJ422",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -5217,7 +4905,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -5250,127 +4938,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_AVX2",
@@ -5394,7 +4962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_AVX2",
@@ -5418,7 +4986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_SSSE3",
@@ -5442,7 +5010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -5466,7 +5034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_SSSE3",
@@ -5490,97 +5058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_AVX2",
@@ -5598,7 +5076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_AVX2",
@@ -5616,7 +5094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_SSSE3",
@@ -5634,7 +5112,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -5652,7 +5130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_SSSE3",
@@ -5670,7 +5148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -5697,7 +5175,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -5715,7 +5193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -5742,7 +5220,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -5760,7 +5238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -5787,7 +5265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -5805,7 +5283,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -5835,7 +5313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -5856,7 +5334,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -5883,7 +5361,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -5910,7 +5388,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_AVX2",
@@ -5928,7 +5406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_AVX2",
@@ -5946,7 +5424,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_SSSE3",
@@ -5964,7 +5442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -5982,7 +5460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_SSSE3",
@@ -6000,7 +5478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -6027,7 +5505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_SSE2",
@@ -6045,7 +5523,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -6063,7 +5541,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_SSE2",
@@ -6081,7 +5559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -6120,7 +5598,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -6144,7 +5622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -6162,7 +5640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -6189,7 +5667,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_SSE2",
@@ -6207,7 +5685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -6225,7 +5703,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_SSE2",
@@ -6243,7 +5721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -6282,7 +5760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -6306,7 +5784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -6324,7 +5802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -6357,7 +5835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_AVX2",
@@ -6378,7 +5856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_AVX2",
@@ -6399,7 +5877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_SSE2",
@@ -6420,7 +5898,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -6441,7 +5919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_SSE2",
@@ -6462,7 +5940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -6486,7 +5964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_SSE2",
@@ -6510,7 +5988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -6537,7 +6015,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_AVX2",
@@ -6555,7 +6033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_AVX2",
@@ -6573,7 +6051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_SSSE3",
@@ -6591,7 +6069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -6609,7 +6087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_SSSE3",
@@ -6627,7 +6105,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -6660,7 +6138,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -6681,7 +6159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_SSSE3",
@@ -6702,7 +6180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -6738,7 +6216,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -6768,7 +6246,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -6789,7 +6267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_SSSE3",
@@ -6810,7 +6288,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -6840,7 +6318,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -6858,7 +6336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_X86",
@@ -6876,7 +6354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -6903,7 +6381,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -6930,7 +6408,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6957,7 +6435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_AVX2",
@@ -6975,7 +6453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_AVX2",
@@ -6993,7 +6471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_SSE2",
@@ -7011,7 +6489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -7029,7 +6507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_SSE2",
@@ -7047,7 +6525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -7074,7 +6552,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_AVX2",
@@ -7092,7 +6570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_AVX2",
@@ -7110,7 +6588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_SSE2",
@@ -7128,7 +6606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -7146,7 +6624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_SSE2",
@@ -7164,7 +6642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -7185,7 +6663,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -7212,7 +6690,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_AVX2",
@@ -7230,7 +6708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_AVX2",
@@ -7248,7 +6726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_SSE2",
@@ -7266,7 +6744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -7284,7 +6762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_SSE2",
@@ -7302,7 +6780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -7329,7 +6807,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -7347,7 +6825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_SSSE3",
@@ -7365,7 +6843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -7392,7 +6870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -7428,7 +6906,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -7458,7 +6936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -7482,7 +6960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_SSSE3",
@@ -7506,7 +6984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -7533,7 +7011,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_AVX2",
@@ -7551,7 +7029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_AVX2",
@@ -7569,7 +7047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_SSE2",
@@ -7587,7 +7065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -7605,7 +7083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_SSE2",
@@ -7623,7 +7101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -7656,7 +7134,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_AVX2",
@@ -7677,7 +7155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_AVX2",
@@ -7698,7 +7176,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_SSE2",
@@ -7719,7 +7197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -7740,7 +7218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_SSE2",
@@ -7761,7 +7239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -7791,7 +7269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_AVX2",
@@ -7812,7 +7290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -7833,7 +7311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_SSE2",
@@ -7854,7 +7332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -7890,7 +7368,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -7914,7 +7392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_SSE2",
@@ -7938,7 +7416,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -7968,37 +7446,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBRotate",
-   "linker_set_key" : "ARGBRotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -8025,7 +7473,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -8040,7 +7488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_SSSE3",
@@ -8055,7 +7503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -8073,7 +7521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_X86",
@@ -8091,7 +7539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -8121,7 +7569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -8142,7 +7590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_SSE2",
@@ -8163,7 +7611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -8193,7 +7641,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_AVX2",
@@ -8214,7 +7662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_AVX2",
@@ -8235,7 +7683,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_SSSE3",
@@ -8256,7 +7704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -8277,7 +7725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_SSSE3",
@@ -8298,7 +7746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -8325,7 +7773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -8352,7 +7800,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -8379,7 +7827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -8412,7 +7860,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_AVX2",
@@ -8433,7 +7881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_AVX2",
@@ -8454,7 +7902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_SSE2",
@@ -8475,7 +7923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -8496,7 +7944,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_SSE2",
@@ -8517,7 +7965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -8544,7 +7992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_AVX2",
@@ -8562,7 +8010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_AVX2",
@@ -8580,7 +8028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_SSSE3",
@@ -8598,7 +8046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -8616,7 +8064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_SSSE3",
@@ -8634,34 +8082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToABGR",
-   "linker_set_key" : "ARGBToABGR",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -8688,7 +8109,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_AVX2",
@@ -8706,7 +8127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_AVX2",
@@ -8724,7 +8145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_SSSE3",
@@ -8742,7 +8163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -8760,7 +8181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_SSSE3",
@@ -8778,7 +8199,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -8805,7 +8226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_AVX2",
@@ -8823,7 +8244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_AVX2",
@@ -8841,7 +8262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_SSSE3",
@@ -8859,7 +8280,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -8877,7 +8298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_SSSE3",
@@ -8895,7 +8316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -8922,7 +8343,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_SSE2",
@@ -8940,7 +8361,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -8958,7 +8379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_SSE2",
@@ -8976,7 +8397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -9003,7 +8424,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_SSE2",
@@ -9021,7 +8442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -9039,7 +8460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_SSE2",
@@ -9057,34 +8478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToBGRA",
-   "linker_set_key" : "ARGBToBGRA",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -9111,7 +8505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -9150,52 +8544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::ARGBToI420Alpha",
-   "linker_set_key" : "ARGBToI420Alpha",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -9234,7 +8583,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -9273,7 +8622,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -9300,7 +8649,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -9339,7 +8688,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -9378,7 +8727,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -9411,7 +8760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -9444,7 +8793,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -9471,7 +8820,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_AVX2",
@@ -9489,7 +8838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_AVX2",
@@ -9507,7 +8856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_SSSE3",
@@ -9525,7 +8874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -9543,7 +8892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_SSSE3",
@@ -9561,7 +8910,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -9588,7 +8937,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX2",
@@ -9606,7 +8955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX512VBMI",
@@ -9624,7 +8973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX2",
@@ -9642,7 +8991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX512VBMI",
@@ -9660,7 +9009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_SSSE3",
@@ -9678,7 +9027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -9696,7 +9045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_SSSE3",
@@ -9714,7 +9063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -9741,7 +9090,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -9771,7 +9120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_AVX2",
@@ -9785,14 +9134,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_AVX2",
@@ -9813,7 +9162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_SSE2",
@@ -9834,7 +9183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -9848,14 +9197,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_SSE2",
@@ -9869,14 +9218,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTIKj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_SSE2",
@@ -9894,7 +9243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -9912,7 +9261,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_SSE2",
@@ -9930,7 +9279,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -9957,7 +9306,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_SSSE3",
@@ -9978,7 +9327,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -9999,7 +9348,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_SSSE3",
@@ -10020,7 +9369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_AVX2",
@@ -10044,7 +9393,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_AVX2",
@@ -10068,7 +9417,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_SSSE3",
@@ -10092,7 +9441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -10116,7 +9465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_SSSE3",
@@ -10140,7 +9489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_AVX2",
@@ -10164,7 +9513,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_AVX2",
@@ -10188,7 +9537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_SSSE3",
@@ -10212,7 +9561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -10236,7 +9585,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_SSSE3",
@@ -10260,7 +9609,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -10287,7 +9636,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_AVX2",
@@ -10305,7 +9654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_AVX2",
@@ -10323,7 +9672,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_SSSE3",
@@ -10341,7 +9690,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -10359,7 +9708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_SSSE3",
@@ -10377,7 +9726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_AVX2",
@@ -10395,7 +9744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_AVX2",
@@ -10413,7 +9762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_SSSE3",
@@ -10431,7 +9780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -10449,7 +9798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_SSSE3",
@@ -10467,7 +9816,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -10494,7 +9843,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -10521,7 +9870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_AVX2",
@@ -10539,7 +9888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_AVX2",
@@ -10557,7 +9906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_SSE2",
@@ -10575,7 +9924,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -10593,7 +9942,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_SSE2",
@@ -10611,7 +9960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -10644,7 +9993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -10677,7 +10026,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -10698,7 +10047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -10719,7 +10068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -10737,7 +10086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -10779,7 +10128,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -10821,7 +10170,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -10866,7 +10215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -10920,7 +10269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -10977,7 +10326,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -10989,7 +10338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -11016,7 +10365,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -11055,7 +10404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_SSSE3",
@@ -11079,7 +10428,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -11103,7 +10452,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_SSSE3",
@@ -11127,7 +10476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_SSSE3",
@@ -11145,7 +10494,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -11163,7 +10512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_SSSE3",
@@ -11181,7 +10530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -11220,7 +10569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_AVX2",
@@ -11244,7 +10593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_AVX2",
@@ -11268,7 +10617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_SSSE3",
@@ -11292,7 +10641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -11316,7 +10665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_SSSE3",
@@ -11340,7 +10689,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -11361,7 +10710,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -11382,7 +10731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -11409,7 +10758,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -11436,7 +10785,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -11448,25 +10797,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -11487,7 +10818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_SSE2",
@@ -11508,7 +10839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -11526,7 +10857,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -11544,7 +10875,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -11571,7 +10902,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -11601,7 +10932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_AVX2",
@@ -11622,7 +10953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_AVX2",
@@ -11643,7 +10974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_SSSE3",
@@ -11664,7 +10995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -11685,7 +11016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_SSSE3",
@@ -11706,7 +11037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -11736,7 +11067,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_AVX2",
@@ -11757,7 +11088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_AVX2",
@@ -11778,7 +11109,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_SSE2",
@@ -11799,7 +11130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -11820,7 +11151,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_SSE2",
@@ -11841,7 +11172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -11883,7 +11214,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -11928,7 +11259,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -11985,7 +11316,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -12015,7 +11346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -12045,7 +11376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -12072,7 +11403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -12099,7 +11430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -12117,7 +11448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_AVX",
@@ -12135,7 +11466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_AVX",
@@ -12153,7 +11484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_SSE2",
@@ -12171,7 +11502,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -12189,7 +11520,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_ERMS",
@@ -12207,7 +11538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_SSE2",
@@ -12225,7 +11556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -12243,7 +11574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -12270,7 +11601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_SSE2",
@@ -12297,7 +11628,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -12326,143 +11657,8 @@
      "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetilePlane_16",
-   "linker_set_key" : "DetilePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileRow_16_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/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"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_SSE2",
@@ -12483,7 +11679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -12504,7 +11700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_SSE2",
@@ -12525,7 +11721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -12561,7 +11757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_SSSE3",
@@ -12585,7 +11781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -12609,7 +11805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_SSSE3",
@@ -12633,124 +11829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2",
-   "linker_set_key" : "DetileToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::DetileToYUY2_Any_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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_AVX2",
@@ -12771,7 +11850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_AVX2",
@@ -12792,7 +11871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -12813,7 +11892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -12828,7 +11907,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_X86",
@@ -12843,7 +11922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -12858,7 +11937,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_X86",
@@ -12873,37 +11952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::GaussCol_C",
-   "linker_set_key" : "GaussCol_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -12933,7 +11982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -12960,25 +12009,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::GaussRow_C",
-   "linker_set_key" : "GaussRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKj"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -12996,13 +12027,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -13041,7 +12072,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -13080,7 +12111,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -13119,7 +12150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -13158,7 +12189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -13197,7 +12228,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -13236,7 +12267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -13275,7 +12306,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -13314,7 +12345,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -13353,7 +12384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -13392,7 +12423,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -13431,7 +12462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -13470,7 +12501,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -13509,7 +12540,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -13548,7 +12579,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -13587,7 +12618,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -13626,7 +12657,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -13665,7 +12696,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -13704,7 +12735,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -13743,7 +12774,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -13773,7 +12804,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_AVX2",
@@ -13794,7 +12825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_AVX2",
@@ -13815,7 +12846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_SSE2",
@@ -13836,7 +12867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -13857,7 +12888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_SSE2",
@@ -13878,7 +12909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -13911,7 +12942,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_AVX2",
@@ -13938,7 +12969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -13965,7 +12996,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_SSSE3",
@@ -13992,7 +13023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_AVX2",
@@ -14010,7 +13041,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -14028,7 +13059,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSE42",
@@ -14046,7 +13077,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSSE3",
@@ -14064,7 +13095,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -14082,7 +13113,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -14100,7 +13131,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_SSE41",
@@ -14118,7 +13149,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -14169,7 +13200,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -14223,7 +13254,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -14274,61 +13305,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I010Rotate",
-   "linker_set_key" : "I010Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -14367,7 +13344,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -14406,7 +13383,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -14445,7 +13422,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -14487,7 +13464,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -14532,7 +13509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -14571,7 +13548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -14613,7 +13590,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -14658,7 +13635,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -14709,7 +13686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -14760,7 +13737,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -14805,7 +13782,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -14847,7 +13824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -14889,7 +13866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -14940,7 +13917,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -14985,7 +13962,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -15036,7 +14013,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -15090,7 +14067,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -15120,7 +14097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -15171,61 +14148,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I210Rotate",
-   "linker_set_key" : "I210Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -15264,7 +14187,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -15303,7 +14226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -15342,7 +14265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -15384,7 +14307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -15429,7 +14352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_AVX2",
@@ -15456,7 +14379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_AVX2",
@@ -15483,7 +14406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_SSSE3",
@@ -15510,7 +14433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -15537,7 +14460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_SSSE3",
@@ -15564,7 +14487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -15603,7 +14526,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -15645,7 +14568,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -15690,7 +14613,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_AVX2",
@@ -15717,7 +14640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_AVX2",
@@ -15744,7 +14667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_SSSE3",
@@ -15771,7 +14694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -15798,7 +14721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_SSSE3",
@@ -15825,7 +14748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -15876,7 +14799,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -15927,7 +14850,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -15978,7 +14901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -16029,7 +14952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -16074,7 +14997,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_AVX2",
@@ -16101,7 +15024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_AVX2",
@@ -16128,7 +15051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_SSSE3",
@@ -16155,7 +15078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -16182,7 +15105,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_SSSE3",
@@ -16209,7 +15132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_AVX2",
@@ -16236,7 +15159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_AVX2",
@@ -16263,7 +15186,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_SSSE3",
@@ -16290,7 +15213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -16317,7 +15240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_SSSE3",
@@ -16344,58 +15267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I212ToI420",
-   "linker_set_key" : "I212ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -16446,7 +15318,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -16491,7 +15363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -16518,7 +15390,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -16545,7 +15417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -16572,7 +15444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -16602,7 +15474,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_AVX2",
@@ -16623,7 +15495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_AVX2",
@@ -16644,7 +15516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_SSE2",
@@ -16665,7 +15537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -16686,7 +15558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_SSE2",
@@ -16707,7 +15579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -16734,7 +15606,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -16773,7 +15645,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -16806,7 +15678,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -16857,7 +15729,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -16887,112 +15759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::I410Copy",
-   "linker_set_key" : "I410Copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::I410Rotate",
-   "linker_set_key" : "I410Rotate",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -17034,7 +15801,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_AVX2",
@@ -17061,7 +15828,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_AVX2",
@@ -17088,7 +15855,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_SSSE3",
@@ -17115,7 +15882,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -17142,7 +15909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_SSSE3",
@@ -17169,7 +15936,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -17211,7 +15978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_AVX2",
@@ -17238,7 +16005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_AVX2",
@@ -17265,7 +16032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_SSSE3",
@@ -17292,7 +16059,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -17319,7 +16086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_SSSE3",
@@ -17346,7 +16113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -17397,58 +16164,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I410ToI420",
-   "linker_set_key" : "I410ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -17499,58 +16215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I412ToI420",
-   "linker_set_key" : "I412ToI420",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -17601,7 +16266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -17649,7 +16314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -17697,7 +16362,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -17748,7 +16413,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -17802,7 +16467,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -17877,7 +16542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -17928,7 +16593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -18000,7 +16665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -18051,7 +16716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -18102,7 +16767,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -18150,7 +16815,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -18204,7 +16869,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -18264,7 +16929,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -18324,7 +16989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -18384,7 +17049,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -18435,7 +17100,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -18474,7 +17139,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -18513,7 +17178,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -18552,7 +17217,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -18594,7 +17259,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -18633,7 +17298,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -18672,7 +17337,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -18711,7 +17376,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -18753,7 +17418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -18798,7 +17463,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -18837,7 +17502,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -18888,7 +17553,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -18939,7 +17604,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -18978,7 +17643,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -19029,7 +17694,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -19080,7 +17745,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -19125,7 +17790,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -19170,7 +17835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -19209,7 +17874,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -19248,7 +17913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -19290,52 +17955,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I420ToRGB24MatrixFilter",
-   "linker_set_key" : "I420ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -19374,7 +17994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -19416,7 +18036,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -19458,7 +18078,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -19497,7 +18117,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -19539,7 +18159,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -19578,7 +18198,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -19617,7 +18237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -19665,7 +18285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -19713,7 +18333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -19764,7 +18384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -19818,7 +18438,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_AVX2",
@@ -19848,7 +18468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_AVX2",
@@ -19878,7 +18498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_SSSE3",
@@ -19908,7 +18528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -19938,7 +18558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_SSSE3",
@@ -19968,7 +18588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -20019,7 +18639,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -20073,7 +18693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -20133,7 +18753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -20193,7 +18813,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -20253,7 +18873,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -20292,7 +18912,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_AVX2",
@@ -20319,7 +18939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_AVX2",
@@ -20346,7 +18966,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_SSSE3",
@@ -20373,7 +18993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -20400,7 +19020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_SSSE3",
@@ -20427,7 +19047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -20466,7 +19086,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_AVX2",
@@ -20493,7 +19113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_AVX2",
@@ -20520,7 +19140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_SSSE3",
@@ -20547,7 +19167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -20574,7 +19194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_SSSE3",
@@ -20601,7 +19221,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_AVX2",
@@ -20628,7 +19248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_AVX2",
@@ -20655,7 +19275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_SSSE3",
@@ -20682,7 +19302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -20709,7 +19329,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_SSSE3",
@@ -20736,7 +19356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -20778,7 +19398,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -20823,7 +19443,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX2",
@@ -20850,7 +19470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX2",
@@ -20877,7 +19497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_SSSE3",
@@ -20904,7 +19524,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -20931,7 +19551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_SSSE3",
@@ -20958,7 +19578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -20997,7 +19617,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -21048,7 +19668,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -21099,7 +19719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -21150,7 +19770,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -21195,172 +19815,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRAW",
-   "linker_set_key" : "I422ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24",
-   "linker_set_key" : "I422ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24Matrix",
-   "linker_set_key" : "I422ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB24MatrixFilter",
-   "linker_set_key" : "I422ToRGB24MatrixFilter",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_AVX2",
@@ -21387,7 +19842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_AVX2",
@@ -21414,7 +19869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_SSSE3",
@@ -21441,7 +19896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -21468,7 +19923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_SSSE3",
@@ -21495,7 +19950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -21534,49 +19989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I422ToRGB565Matrix",
-   "linker_set_key" : "I422ToRGB565Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_AVX2",
@@ -21603,7 +20016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_AVX2",
@@ -21630,7 +20043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_SSSE3",
@@ -21657,7 +20070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -21684,7 +20097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_SSSE3",
@@ -21711,7 +20124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -21750,7 +20163,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -21792,7 +20205,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_AVX2",
@@ -21819,7 +20232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_AVX2",
@@ -21846,7 +20259,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_SSSE3",
@@ -21873,7 +20286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -21900,7 +20313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_SSSE3",
@@ -21927,7 +20340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -21966,7 +20379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_AVX2",
@@ -21990,7 +20403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_AVX2",
@@ -22014,7 +20427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_SSE2",
@@ -22038,7 +20451,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -22062,7 +20475,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_SSE2",
@@ -22086,7 +20499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -22125,7 +20538,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_AVX2",
@@ -22149,7 +20562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_AVX2",
@@ -22173,7 +20586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_SSE2",
@@ -22197,7 +20610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -22221,7 +20634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_SSE2",
@@ -22245,7 +20658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -22293,7 +20706,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -22341,7 +20754,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -22392,7 +20805,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_AVX2",
@@ -22422,7 +20835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_AVX2",
@@ -22452,7 +20865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_SSSE3",
@@ -22482,7 +20895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -22512,7 +20925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_SSSE3",
@@ -22542,7 +20955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -22593,7 +21006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -22647,7 +21060,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -22707,7 +21120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -22767,7 +21180,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -22827,7 +21240,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -22866,7 +21279,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -22905,7 +21318,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -22947,7 +21360,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_AVX2",
@@ -22974,7 +21387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_AVX2",
@@ -23001,7 +21414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_SSSE3",
@@ -23028,7 +21441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -23055,7 +21468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_SSSE3",
@@ -23082,7 +21495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -23133,7 +21546,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -23178,7 +21591,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -23223,268 +21636,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRAW",
-   "linker_set_key" : "I444ToRAW",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24",
-   "linker_set_key" : "I444ToRGB24",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Matrix",
-   "linker_set_key" : "I444ToRGB24Matrix",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKN6libyuv12YuvConstantsE"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::I444ToRGB24Row_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"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -23520,7 +21678,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -23556,7 +21714,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_AVX2",
@@ -23583,7 +21741,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_AVX2",
@@ -23610,7 +21768,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -23637,7 +21795,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -23661,7 +21819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_AVX2",
@@ -23685,7 +21843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_AVX2",
@@ -23709,7 +21867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_SSSE3",
@@ -23733,7 +21891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -23757,7 +21915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_SSSE3",
@@ -23781,7 +21939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -23808,7 +21966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_SSE2",
@@ -23826,7 +21984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -23844,7 +22002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_SSE2",
@@ -23862,7 +22020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -23901,7 +22059,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -23940,7 +22098,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -23979,7 +22137,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -24018,7 +22176,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -24057,7 +22215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -24096,7 +22254,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -24135,7 +22293,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -24174,7 +22332,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -24213,7 +22371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -24234,7 +22392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -24267,7 +22425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -24312,7 +22470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -24351,7 +22509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -24390,7 +22548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -24435,7 +22593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -24474,79 +22632,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MM21ToYUY2",
-   "linker_set_key" : "MM21ToYUY2",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::MT2TToP010",
-   "linker_set_key" : "MT2TToP010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -24558,7 +22644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -24606,7 +22692,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_AVX2",
@@ -24636,7 +22722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_AVX2",
@@ -24666,7 +22752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -24696,7 +22782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -24744,7 +22830,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_AVX2",
@@ -24774,7 +22860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_AVX2",
@@ -24804,7 +22890,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -24834,7 +22920,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -24879,7 +22965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_AVX2",
@@ -24906,7 +22992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_AVX2",
@@ -24933,7 +23019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_SSE2",
@@ -24960,7 +23046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -24987,7 +23073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_SSE2",
@@ -25014,7 +23100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -25053,7 +23139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_Any_SSSE3",
@@ -25077,7 +23163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -25101,7 +23187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_SSSE3",
@@ -25125,7 +23211,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -25158,7 +23244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -25194,7 +23280,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_AVX2",
@@ -25218,7 +23304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_AVX2",
@@ -25242,7 +23328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -25266,7 +23352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_AVX2",
@@ -25287,28 +23373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_AVX2",
@@ -25329,28 +23394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_SSE2",
@@ -25371,7 +23415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -25392,7 +23436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_SSE2",
@@ -25413,7 +23457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -25455,7 +23499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_AVX2",
@@ -25482,7 +23526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_AVX2",
@@ -25509,7 +23553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -25536,7 +23580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_AVX2",
@@ -25563,7 +23607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_AVX2",
@@ -25590,7 +23634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -25617,7 +23661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_AVX2",
@@ -25644,7 +23688,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_AVX2",
@@ -25671,7 +23715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -25698,7 +23742,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_AVX2",
@@ -25722,7 +23766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_AVX2",
@@ -25746,7 +23790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_SSE2",
@@ -25770,7 +23814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -25794,7 +23838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_SSE2",
@@ -25818,7 +23862,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -25830,7 +23874,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -25857,25 +23901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
-  },
-  {
-   "function_name" : "libyuv::MirrorRow_16_C",
-   "linker_set_key" : "MirrorRow_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_AVX2",
@@ -25893,7 +23919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_AVX2",
@@ -25911,7 +23937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_SSSE3",
@@ -25929,7 +23955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -25947,7 +23973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_SSSE3",
@@ -25965,7 +23991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -25986,7 +24012,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_SSSE3",
@@ -26007,7 +24033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -26034,7 +24060,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_AVX2",
@@ -26052,7 +24078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_AVX2",
@@ -26070,7 +24096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_SSSE3",
@@ -26088,7 +24114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -26106,7 +24132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_SSSE3",
@@ -26124,7 +24150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_AVX2",
@@ -26145,7 +24171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_AVX2",
@@ -26166,7 +24192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -26187,7 +24213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -26226,7 +24252,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -26265,7 +24291,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -26313,7 +24339,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -26346,7 +24372,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -26379,7 +24405,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -26415,7 +24441,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_AVX2",
@@ -26439,7 +24465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_AVX2",
@@ -26463,7 +24489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_SSSE3",
@@ -26487,7 +24513,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -26511,7 +24537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_SSSE3",
@@ -26535,7 +24561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -26580,7 +24606,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -26628,7 +24654,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -26667,7 +24693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -26700,7 +24726,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -26733,7 +24759,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -26769,7 +24795,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_AVX2",
@@ -26793,7 +24819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_AVX2",
@@ -26817,7 +24843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_SSSE3",
@@ -26841,7 +24867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -26865,7 +24891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_SSSE3",
@@ -26889,7 +24915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -26922,7 +24948,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -26958,7 +24984,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_AVX2",
@@ -26982,7 +25008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_AVX2",
@@ -27006,7 +25032,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_SSSE3",
@@ -27030,7 +25056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -27054,7 +25080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_SSSE3",
@@ -27078,7 +25104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -27117,7 +25143,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -27156,7 +25182,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -27189,7 +25215,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -27222,7 +25248,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -27258,7 +25284,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_AVX2",
@@ -27282,7 +25308,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_AVX2",
@@ -27306,7 +25332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_SSSE3",
@@ -27330,7 +25356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -27354,7 +25380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_SSSE3",
@@ -27378,7 +25404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -27423,7 +25449,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -27462,7 +25488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -27495,7 +25521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -27528,7 +25554,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -27564,7 +25590,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_AVX2",
@@ -27588,7 +25614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_AVX2",
@@ -27612,7 +25638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_SSSE3",
@@ -27636,7 +25662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -27660,7 +25686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_SSSE3",
@@ -27684,7 +25710,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -27717,7 +25743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_AVX2",
@@ -27738,7 +25764,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_AVX2",
@@ -27759,7 +25785,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_SSSE3",
@@ -27780,7 +25806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -27801,7 +25827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_SSSE3",
@@ -27822,7 +25848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -27858,7 +25884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -27897,7 +25923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -27933,7 +25959,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -27972,52 +25998,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
-  },
-  {
-   "function_name" : "libyuv::P010ToI010",
-   "linker_set_key" : "P010ToI010",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -28056,52 +26037,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
-  },
-  {
-   "function_name" : "libyuv::P012ToI012",
-   "linker_set_key" : "P012ToI012",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -28137,7 +26073,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -28176,7 +26112,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_AVX2",
@@ -28200,7 +26136,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_AVX2",
@@ -28224,7 +26160,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_SSSE3",
@@ -28248,7 +26184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -28272,7 +26208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_SSSE3",
@@ -28296,7 +26232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -28332,7 +26268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -28371,7 +26307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_AVX2",
@@ -28395,7 +26331,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_AVX2",
@@ -28419,7 +26355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_SSSE3",
@@ -28443,7 +26379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -28467,7 +26403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_SSSE3",
@@ -28491,7 +26427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -28530,7 +26466,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_AVX2",
@@ -28554,7 +26490,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_AVX2",
@@ -28578,7 +26514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_SSSE3",
@@ -28602,7 +26538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -28626,7 +26562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_SSSE3",
@@ -28650,7 +26586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_AVX2",
@@ -28674,7 +26610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_AVX2",
@@ -28698,7 +26634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_SSSE3",
@@ -28722,7 +26658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -28746,7 +26682,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_SSSE3",
@@ -28770,7 +26706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -28797,7 +26733,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_SSSE3",
@@ -28815,7 +26751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -28833,7 +26769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_SSSE3",
@@ -28851,7 +26787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -28890,7 +26826,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -28917,7 +26853,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -28956,7 +26892,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -28989,7 +26925,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -29016,7 +26952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_SSSE3",
@@ -29034,7 +26970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -29052,7 +26988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_SSSE3",
@@ -29070,7 +27006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -29097,7 +27033,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_SSSE3",
@@ -29115,7 +27051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -29133,7 +27069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_SSSE3",
@@ -29151,7 +27087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -29175,7 +27111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -29199,7 +27135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_AVX2",
@@ -29217,7 +27153,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_AVX2",
@@ -29235,7 +27171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_SSSE3",
@@ -29253,7 +27189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -29271,7 +27207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_SSSE3",
@@ -29289,7 +27225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -29307,7 +27243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -29334,7 +27270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_SSSE3",
@@ -29352,7 +27288,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -29370,7 +27306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_SSSE3",
@@ -29388,7 +27324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -29415,7 +27351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_SSSE3",
@@ -29433,7 +27369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -29451,7 +27387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_SSSE3",
@@ -29469,7 +27405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -29508,7 +27444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -29535,7 +27471,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -29574,7 +27510,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -29598,7 +27534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -29622,7 +27558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_AVX2",
@@ -29640,7 +27576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_AVX2",
@@ -29658,7 +27594,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_SSSE3",
@@ -29676,7 +27612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -29694,7 +27630,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_SSSE3",
@@ -29712,7 +27648,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -29730,7 +27666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -29757,7 +27693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_SSE2",
@@ -29775,7 +27711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -29793,7 +27729,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_SSE2",
@@ -29811,7 +27747,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -29850,7 +27786,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -29874,7 +27810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -29892,7 +27828,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -29919,7 +27855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -29958,7 +27894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -29985,31 +27921,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
-  },
-  {
-   "function_name" : "libyuv::RGBAToUVJRow_C",
-   "linker_set_key" : "RGBAToUVJRow_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_SSSE3",
@@ -30033,7 +27945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -30057,7 +27969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_SSSE3",
@@ -30081,7 +27993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_AVX2",
@@ -30099,7 +28011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_AVX2",
@@ -30117,7 +28029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_SSSE3",
@@ -30135,7 +28047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -30153,7 +28065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_SSSE3",
@@ -30171,7 +28083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_SSSE3",
@@ -30189,7 +28101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -30207,7 +28119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_SSSE3",
@@ -30225,7 +28137,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -30255,7 +28167,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -30285,7 +28197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -30303,7 +28215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_X86",
@@ -30321,7 +28233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -30357,19 +28269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale_rgb.h"
-  },
-  {
-   "function_name" : "libyuv::RiscvCpuCaps",
-   "linker_set_key" : "RiscvCpuCaps",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -30399,7 +28299,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -30426,7 +28326,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -30453,7 +28353,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -30480,37 +28380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
-  },
-  {
-   "function_name" : "libyuv::RotatePlane_16",
-   "linker_set_key" : "RotatePlane_16",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv12RotationModeE"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -30570,7 +28440,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -30594,7 +28464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -30618,7 +28488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_SSE2",
@@ -30642,7 +28512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -30666,7 +28536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_SSE2",
@@ -30690,7 +28560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -30714,7 +28584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -30738,7 +28608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_SSSE3",
@@ -30762,7 +28632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_SSE2",
@@ -30783,7 +28653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -30804,7 +28674,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_SSE2",
@@ -30825,7 +28695,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_SSE2",
@@ -30846,7 +28716,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -30867,7 +28737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_SSE2",
@@ -30888,7 +28758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_SSE2",
@@ -30909,7 +28779,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -30930,7 +28800,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_SSE2",
@@ -30951,7 +28821,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_SSE2",
@@ -30975,7 +28845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -30999,7 +28869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_SSE2",
@@ -31023,7 +28893,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_SSE2",
@@ -31047,7 +28917,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -31071,7 +28941,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_SSE2",
@@ -31095,7 +28965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -31113,7 +28983,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_AVX2",
@@ -31131,7 +29001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_AVX2",
@@ -31149,7 +29019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_SSE2",
@@ -31167,7 +29037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -31185,7 +29055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_SSE2",
@@ -31203,7 +29073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -31227,7 +29097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -31251,7 +29121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_SSE2",
@@ -31275,7 +29145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -31299,7 +29169,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -31323,7 +29193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -31347,7 +29217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -31371,7 +29241,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -31395,7 +29265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -31419,7 +29289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_SSSE3",
@@ -31443,7 +29313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -31467,7 +29337,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -31488,7 +29358,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -31524,46 +29394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScalePlaneDown2_16To8",
-   "linker_set_key" : "ScalePlaneDown2_16To8",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIN6libyuv10FilterModeE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -31608,7 +29439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -31653,7 +29484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -31701,7 +29532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -31737,7 +29568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -31773,55 +29604,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Box_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Box_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -31842,7 +29625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_AVX2",
@@ -31863,7 +29646,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_AVX2",
@@ -31884,7 +29667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_SSSE3",
@@ -31905,7 +29688,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -31926,7 +29709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_AVX2",
@@ -31947,7 +29730,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -31968,7 +29751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_SSSE3",
@@ -31989,7 +29772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_SSSE3",
@@ -32010,55 +29793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2Linear_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2Linear_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -32079,7 +29814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_AVX2",
@@ -32100,7 +29835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_AVX2",
@@ -32121,7 +29856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_SSSE3",
@@ -32142,7 +29877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -32163,7 +29898,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_SSSE3",
@@ -32184,55 +29919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
-  },
-  {
-   "function_name" : "libyuv::ScaleRowDown2_16To8_Odd_C",
-   "linker_set_key" : "ScaleRowDown2_16To8_Odd_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -32253,7 +29940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_AVX2",
@@ -32274,7 +29961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_AVX2",
@@ -32295,7 +29982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_SSSE3",
@@ -32316,7 +30003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -32337,7 +30024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_SSSE3",
@@ -32358,7 +30045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -32379,7 +30066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_SSSE3",
@@ -32400,7 +30087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -32421,7 +30108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_SSSE3",
@@ -32442,7 +30129,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -32463,7 +30150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -32484,7 +30171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_SSSE3",
@@ -32505,7 +30192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -32526,7 +30213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_SSSE3",
@@ -32547,7 +30234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_SSSE3",
@@ -32568,7 +30255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -32589,7 +30276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_SSSE3",
@@ -32610,7 +30297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -32631,7 +30318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -32652,7 +30339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_SSSE3",
@@ -32673,7 +30360,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -32694,7 +30381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_SSSE3",
@@ -32715,7 +30402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -32736,7 +30423,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_SSSE3",
@@ -32757,7 +30444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -32778,7 +30465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_SSSE3",
@@ -32799,7 +30486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_SSSE3",
@@ -32820,7 +30507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -32841,7 +30528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_SSSE3",
@@ -32862,7 +30549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -32883,7 +30570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_AVX2",
@@ -32904,7 +30591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_AVX2",
@@ -32925,7 +30612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_SSSE3",
@@ -32946,7 +30633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -32967,7 +30654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_SSSE3",
@@ -32988,7 +30675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -33009,7 +30696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_AVX2",
@@ -33030,7 +30717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_AVX2",
@@ -33051,7 +30738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_SSSE3",
@@ -33072,7 +30759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -33093,7 +30780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_SSSE3",
@@ -33114,7 +30801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_AVX2",
@@ -33138,7 +30825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_AVX2",
@@ -33162,7 +30849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_SSSE3",
@@ -33186,7 +30873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_SSSE3",
@@ -33210,7 +30897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_AVX2",
@@ -33234,7 +30921,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_AVX2",
@@ -33258,7 +30945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -33282,7 +30969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_SSE2",
@@ -33306,7 +30993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -33330,7 +31017,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_SSE2",
@@ -33354,7 +31041,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_AVX2",
@@ -33378,7 +31065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_AVX2",
@@ -33402,7 +31089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -33426,7 +31113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSE2",
@@ -33450,7 +31137,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSSE3",
@@ -33474,7 +31161,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -33498,7 +31185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSE2",
@@ -33522,7 +31209,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSSE3",
@@ -33546,7 +31233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_AVX2",
@@ -33564,7 +31251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_AVX2",
@@ -33582,7 +31269,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_SSSE3",
@@ -33600,7 +31287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_SSSE3",
@@ -33618,7 +31305,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_AVX2",
@@ -33636,7 +31323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_AVX2",
@@ -33654,7 +31341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -33672,7 +31359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_SSE2",
@@ -33690,7 +31377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -33708,7 +31395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_SSE2",
@@ -33726,7 +31413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_AVX2",
@@ -33744,7 +31431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_AVX2",
@@ -33762,7 +31449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -33780,7 +31467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSE2",
@@ -33798,7 +31485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSSE3",
@@ -33816,7 +31503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -33834,7 +31521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSE2",
@@ -33852,7 +31539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSSE3",
@@ -33870,7 +31557,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -33891,7 +31578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -33927,7 +31614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -33948,7 +31635,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -33972,7 +31659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -33996,7 +31683,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -34020,7 +31707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -34044,7 +31731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -34068,7 +31755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_AVX2",
@@ -34089,7 +31776,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_AVX2",
@@ -34110,7 +31797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_SSSE3",
@@ -34131,7 +31818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -34152,7 +31839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_SSSE3",
@@ -34173,7 +31860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -34194,7 +31881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -34215,7 +31902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -34239,7 +31926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -34263,7 +31950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_AVX2",
@@ -34287,7 +31974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_AVX2",
@@ -34311,7 +31998,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -34335,7 +32022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_SSE41",
@@ -34359,7 +32046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -34383,7 +32070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_SSE41",
@@ -34407,7 +32094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_AVX2",
@@ -34431,7 +32118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_AVX2",
@@ -34455,7 +32142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -34479,7 +32166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_SSSE3",
@@ -34503,7 +32190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -34527,7 +32214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_SSSE3",
@@ -34551,7 +32238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_AVX2",
@@ -34569,7 +32256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_AVX2",
@@ -34587,7 +32274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -34605,7 +32292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_SSE41",
@@ -34623,7 +32310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -34641,7 +32328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_SSE41",
@@ -34659,7 +32346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_AVX2",
@@ -34677,7 +32364,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_AVX2",
@@ -34695,7 +32382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -34713,7 +32400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_SSSE3",
@@ -34731,7 +32418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -34749,7 +32436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_SSSE3",
@@ -34767,7 +32454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -34791,7 +32478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_X86",
@@ -34809,7 +32496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -34827,7 +32514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_ERMS",
@@ -34845,7 +32532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_X86",
@@ -34863,7 +32550,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_SSE2",
@@ -34884,7 +32571,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -34905,7 +32592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_SSE2",
@@ -34926,7 +32613,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_SSE2",
@@ -34947,7 +32634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -34968,7 +32655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_SSE2",
@@ -34989,7 +32676,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -35013,7 +32700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_SSE2",
@@ -35037,7 +32724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_SSE2",
@@ -35058,7 +32745,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -35079,7 +32766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_SSE2",
@@ -35100,7 +32787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -35121,7 +32808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_SSE2",
@@ -35142,7 +32829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -35187,7 +32874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_AVX2",
@@ -35214,7 +32901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_AVX2",
@@ -35241,7 +32928,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSE2",
@@ -35268,7 +32955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSSE3",
@@ -35295,7 +32982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -35322,7 +33009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSE2",
@@ -35349,7 +33036,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSSE3",
@@ -35376,7 +33063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -35415,7 +33102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_SSSE3",
@@ -35439,7 +33126,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -35463,7 +33150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_SSSE3",
@@ -35487,7 +33174,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -35523,7 +33210,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -35556,7 +33243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -35589,7 +33276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -35622,7 +33309,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -35655,7 +33342,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -35688,7 +33375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -35724,7 +33411,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_AVX2",
@@ -35748,7 +33435,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_AVX2",
@@ -35772,7 +33459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -35796,7 +33483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_AVX2",
@@ -35817,7 +33504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_AVX2",
@@ -35838,7 +33525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_SSE2",
@@ -35859,7 +33546,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -35880,7 +33567,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_SSE2",
@@ -35901,7 +33588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_AVX2",
@@ -35925,7 +33612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_AVX2",
@@ -35949,7 +33636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSE2",
@@ -35973,7 +33660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSSE3",
@@ -35997,7 +33684,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -36021,7 +33708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSE2",
@@ -36045,7 +33732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSSE3",
@@ -36069,7 +33756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -36084,7 +33771,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -36102,7 +33789,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_SSE2",
@@ -36120,7 +33807,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -36147,7 +33834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_AVX2",
@@ -36165,7 +33852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_AVX2",
@@ -36183,7 +33870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_SSSE3",
@@ -36201,7 +33888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -36219,7 +33906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_SSSE3",
@@ -36237,79 +33924,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -36336,7 +33951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -36366,7 +33981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -36399,31 +34014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWx8_16_C",
-   "linker_set_key" : "TransposeWx8_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_SSSE3",
@@ -36447,7 +34038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -36471,7 +34062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_SSSE3",
@@ -36495,34 +34086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
-  },
-  {
-   "function_name" : "libyuv::TransposeWxH_16_C",
-   "linker_set_key" : "TransposeWxH_16_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -36549,7 +34113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -36588,7 +34152,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -36627,7 +34191,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -36666,7 +34230,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -36705,7 +34269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -36744,7 +34308,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -36783,7 +34347,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -36822,7 +34386,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -36861,7 +34425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -36900,7 +34464,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -36939,7 +34503,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -36978,7 +34542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -37017,7 +34581,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -37056,7 +34620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -37095,7 +34659,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -37122,7 +34686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_AVX2",
@@ -37143,7 +34707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_AVX2",
@@ -37164,7 +34728,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_SSSE3",
@@ -37185,7 +34749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -37206,7 +34770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_SSSE3",
@@ -37227,7 +34791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -37266,7 +34830,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -37305,7 +34869,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -37338,7 +34902,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_AVX2",
@@ -37359,7 +34923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_AVX2",
@@ -37380,7 +34944,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_SSE2",
@@ -37401,7 +34965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -37422,7 +34986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_SSE2",
@@ -37443,7 +35007,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_AVX2",
@@ -37467,7 +35031,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_AVX2",
@@ -37491,7 +35055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_SSE2",
@@ -37515,7 +35079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -37539,7 +35103,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_SSE2",
@@ -37563,7 +35127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -37590,7 +35154,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_AVX2",
@@ -37608,7 +35172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_AVX2",
@@ -37626,7 +35190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_SSE2",
@@ -37644,7 +35208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -37662,7 +35226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_SSE2",
@@ -37680,25 +35244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
-  },
-  {
-   "function_name" : "libyuv::UnpackMT2T_C",
-   "linker_set_key" : "UnpackMT2T_C",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIPt"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -37713,7 +35259,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -37740,7 +35286,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_AVX2",
@@ -37761,7 +35307,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_AVX2",
@@ -37782,7 +35328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_SSSE3",
@@ -37803,7 +35349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -37824,7 +35370,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_SSSE3",
@@ -37845,7 +35391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -37884,7 +35430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -37923,7 +35469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -37956,112 +35502,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "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"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_AVX2",
@@ -38082,7 +35523,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_AVX2",
@@ -38103,7 +35544,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_SSE2",
@@ -38124,7 +35565,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -38145,7 +35586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_SSE2",
@@ -38166,7 +35607,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_AVX2",
@@ -38190,7 +35631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_AVX2",
@@ -38214,7 +35655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_SSE2",
@@ -38238,7 +35679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -38262,7 +35703,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_SSE2",
@@ -38286,7 +35727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -38313,7 +35754,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_AVX2",
@@ -38331,7 +35772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_AVX2",
@@ -38349,7 +35790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_SSE2",
@@ -38367,7 +35808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -38385,7 +35826,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_SSE2",
@@ -38403,7 +35844,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -38417,7 +35858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -38430,7 +35871,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38444,7 +35885,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -38457,7 +35898,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -38479,7 +35920,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -38504,7 +35945,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -38520,7 +35961,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -38533,7 +35974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -38549,7 +35990,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -38565,7 +36006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38582,7 +36023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -38598,7 +36039,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -38614,7 +36055,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -38630,7 +36071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38647,7 +36088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -38661,7 +36102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -38677,7 +36118,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -38693,7 +36134,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -38711,7 +36152,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -38724,7 +36165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -38740,7 +36181,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -38753,7 +36194,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -38766,7 +36207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -38785,7 +36226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -38798,7 +36239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -38811,7 +36252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -38824,7 +36265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -38837,7 +36278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -38846,121 +36287,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -38973,7 +36414,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -38982,7 +36423,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -38991,7 +36432,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39000,7 +36441,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39009,7 +36450,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -39018,7 +36459,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39027,7 +36468,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39036,7 +36477,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -39045,7 +36486,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39054,7 +36495,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39063,16 +36504,7 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKj",
-   "name" : "const unsigned int *",
-   "referenced_type" : "_ZTIKj",
-   "self_type" : "_ZTIPKj",
-   "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39081,7 +36513,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -39090,7 +36522,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39099,7 +36531,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39108,7 +36540,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39117,7 +36549,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39126,7 +36558,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39135,7 +36567,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -39144,7 +36576,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -39153,7 +36585,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39162,7 +36594,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
   },
   {
    "alignment" : 4,
@@ -39171,7 +36603,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -39180,7 +36612,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -39193,7 +36625,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 2,
@@ -39203,7 +36635,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -39213,7 +36645,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -39223,7 +36655,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -39233,7 +36665,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -39243,7 +36675,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -39253,7 +36685,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39263,7 +36695,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -39273,7 +36705,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -39283,7 +36715,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -39312,7 +36744,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -39390,7 +36822,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -39426,7 +36858,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/include/libyuv/row.h"
+   "source_file" : "external/libyuv/files/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -39447,7 +36879,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []