Update libdl ABI dump to reflect changes

Recently, several functions from libdl has been spinned off to
libdl_android.  This commit updates the ABI dump files to reflect the
changes:

* android_create_namespace
* android_dlwarning
* android_get_exported_namespace
* android_init_anonymous_namespace
* android_link_namespaces
* android_set_application_target_sdk_version
* android_update_LD_LIBRARY_PATH

Bug: http://b/129387775
Test: Build aosp_arm64-userdebug and do not see INCOMPATIBLE CHANGES on
      libdl
Change-Id: I4c9278f477ff529f5a2a158e925ebb2f50aa3da4
diff --git a/Q/32/arm_armv7-a-neon/source-based/libdl.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libdl.so.lsdump
index bf74827..7b1ea3f 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libdl.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libdl.so.lsdump
@@ -2,101 +2,11 @@
  "array_types" :
  [
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [8]",
-   "name" : "int [8]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-40",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [1]",
-   "name" : "int [1]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [10]",
-   "name" : "int [10]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-70",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [2]",
-   "name" : "int [2]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-61",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_fpregs::fp_reg [8]",
-   "name" : "user_fpregs::fp_reg [8]",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 96,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-25",
-   "self_type" : "type-84",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [8]",
-   "name" : "unsigned char [8]",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [32]",
-   "name" : "unsigned long [32]",
-   "referenced_type" : "type-28",
-   "self_type" : "type-59",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [18]",
-   "name" : "unsigned long [18]",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 72,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long long [32]",
-   "name" : "unsigned long long [32]",
-   "referenced_type" : "type-31",
-   "self_type" : "type-34",
-   "size" : 256,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "char [32]",
    "name" : "char [32]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-36",
+   "self_type" : "type-35",
    "size" : 32,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -104,10 +14,100 @@
    "alignment" : 1,
    "linker_set_key" : "char [4092]",
    "name" : "char [4092]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-48",
+   "referenced_type" : "type-36",
+   "self_type" : "type-44",
    "size" : 4092,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [10]",
+   "name" : "int [10]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-64",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [1]",
+   "name" : "int [1]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-61",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [2]",
+   "name" : "int [2]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-55",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [8]",
+   "name" : "int [8]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-37",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [16]",
+   "name" : "unsigned char [16]",
+   "referenced_type" : "type-22",
+   "self_type" : "type-78",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [8]",
+   "name" : "unsigned char [8]",
+   "referenced_type" : "type-22",
+   "self_type" : "type-21",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [18]",
+   "name" : "unsigned long [18]",
+   "referenced_type" : "type-25",
+   "self_type" : "type-24",
+   "size" : 72,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [32]",
+   "name" : "unsigned long [32]",
+   "referenced_type" : "type-25",
+   "self_type" : "type-53",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long long [32]",
+   "name" : "unsigned long long [32]",
+   "referenced_type" : "type-28",
+   "self_type" : "type-27",
+   "size" : 256,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_fpregs::fp_reg [8]",
+   "name" : "user_fpregs::fp_reg [8]",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
+   "size" : 96,
+   "source_file" : "/bionic/libc/include/sys/user.h"
   }
  ],
  "builtin_types" :
@@ -116,20 +116,10 @@
    "alignment" : 1,
    "is_integral" : true,
    "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1
   },
   {
@@ -146,16 +136,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 8
   },
   {
@@ -173,8 +163,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1
   },
   {
@@ -183,8 +173,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 4
   },
   {
@@ -193,8 +183,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -203,8 +193,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 8
   },
   {
@@ -213,15 +203,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
+   "referenced_type" : "type-5",
+   "self_type" : "type-5"
   }
  ],
  "elf_functions" :
@@ -240,18 +230,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -260,26 +242,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -333,11 +295,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-45",
+   "underlying_type" : "type-42",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -350,91 +312,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-110"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "referenced_type" : "type-115",
+   "referenced_type" : "type-109",
    "return_type" : "type-1",
-   "self_type" : "type-115",
+   "self_type" : "type-109",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, const void *)",
-   "name" : "void *(unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-127",
-   "return_type" : "type-5",
-   "self_type" : "type-127",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (void *, const void *)",
    "name" : "void (void *, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-13",
-   "return_type" : "type-6",
-   "self_type" : "type-13",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
-   "name" : "void *(unsigned int, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     },
     {
      "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-16",
-   "return_type" : "type-5",
-   "self_type" : "type-16",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned int, const void *)",
-   "name" : "void *(void *, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
     }
    ],
    "referenced_type" : "type-4",
@@ -444,21 +346,63 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
+   "linker_set_key" : "void *(unsigned int, const void *)",
+   "name" : "void *(unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-51",
+   "referenced_type" : "type-121",
    "return_type" : "type-6",
-   "self_type" : "type-51",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "self_type" : "type-121",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
+   "name" : "void *(unsigned int, unsigned int, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "referenced_type" : "type-12",
+   "return_type" : "type-6",
+   "self_type" : "type-12",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(void *, unsigned int, const void *)",
+   "name" : "void *(void *, unsigned int, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "referenced_type" : "type-124",
+   "return_type" : "type-6",
+   "self_type" : "type-124",
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "functions" :
@@ -469,16 +413,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-49",
+   "return_type" : "type-45",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "function_name" : "__cfi_shadow_size",
    "linker_set_key" : "__cfi_shadow_size",
-   "return_type" : "type-7",
+   "return_type" : "type-13",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -487,13 +431,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -502,52 +446,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-31"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
      "referenced_type" : "type-1"
@@ -556,23 +473,8 @@
      "referenced_type" : "type-46"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-54"
-    }
-   ],
    "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "function_name" : "android_get_LD_LIBRARY_PATH",
@@ -580,13 +482,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-47"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl.cpp"
   },
   {
@@ -596,84 +498,15 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-117"
+     "referenced_type" : "type-111"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
    "return_type" : "type-1",
@@ -685,13 +518,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-118"
+     "referenced_type" : "type-112"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-13",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
@@ -700,10 +533,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-48"
     }
    ],
    "return_type" : "type-1",
@@ -715,7 +548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
    "return_type" : "type-1",
@@ -724,7 +557,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-55",
+   "return_type" : "type-47",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -733,13 +566,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
      "referenced_type" : "type-1"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -748,13 +581,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -763,16 +596,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
@@ -782,114 +615,24 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-118",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const elf32_phdr *",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "referenced_type" : "type-115",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, const void *)",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const void *)",
-   "name" : "void (*)(void *, const void *)",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_fpregs *",
-   "name" : "user_fpregs *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-41",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_regs *",
-   "name" : "user_regs *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android_dlextinfo *",
-   "name" : "const android_dlextinfo *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android_namespace_t *",
    "name" : "android_namespace_t *",
    "referenced_type" : "type-3",
@@ -901,71 +644,35 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-55",
+   "referenced_type" : "type-36",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
-   "name" : "void *(*)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-11",
+   "linker_set_key" : "const android_dlextinfo *",
+   "name" : "const android_dlextinfo *",
+   "referenced_type" : "type-30",
+   "self_type" : "type-46",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dynamic *",
-   "name" : "dynamic *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-120",
+   "linker_set_key" : "const elf32_phdr *",
+   "name" : "const elf32_phdr *",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
   },
@@ -973,61 +680,138 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
-  }
- ],
- "qualified_types" :
- [
+  },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-11",
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-110",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dynamic *",
+   "name" : "dynamic *",
+   "referenced_type" : "type-66",
+   "self_type" : "type-114",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
+   "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
+   "referenced_type" : "type-109",
+   "self_type" : "type-111",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int *",
+   "name" : "int *",
+   "referenced_type" : "type-1",
+   "self_type" : "type-112",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned int *",
+   "name" : "unsigned int *",
+   "referenced_type" : "type-13",
+   "self_type" : "type-45",
+   "size" : 4,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_fpregs *",
+   "name" : "user_fpregs *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-38",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_regs *",
+   "name" : "user_regs *",
+   "referenced_type" : "type-23",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const void *)",
+   "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-4",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, const void *)",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
+   "linker_set_key" : "void *",
+   "name" : "void *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-6",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, const void *)",
+   "referenced_type" : "type-121",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
+   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
    "referenced_type" : "type-12",
-   "self_type" : "type-14",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-17",
+   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
+   "name" : "void *(*)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
-  },
+  }
+ ],
+ "qualified_types" :
+ [
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android_dlextinfo",
    "name" : "const android_dlextinfo",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 40,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
@@ -1036,206 +820,270 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-53",
+   "referenced_type" : "type-36",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-9",
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-7",
-   "self_type" : "type-42",
-   "size" : 4,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const elf32_phdr",
    "name" : "const elf32_phdr",
-   "referenced_type" : "type-86",
-   "self_type" : "type-114",
+   "referenced_type" : "type-80",
+   "self_type" : "type-108",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int",
+   "name" : "const unsigned int",
+   "referenced_type" : "type-13",
+   "self_type" : "type-39",
+   "size" : 4,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const void",
+   "name" : "const void",
+   "referenced_type" : "type-5",
+   "self_type" : "type-8",
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, const void *)",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
+   "referenced_type" : "type-11",
+   "self_type" : "type-14",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "m_value",
-     "referenced_type" : "type-31"
+     "field_name" : "v",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
+     "field_name" : "padding",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
     }
    ],
-   "linker_set_key" : "Elf32_Move",
-   "name" : "Elf32_Move",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Move"
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf32_Syminfo",
-   "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Syminfo"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-45"
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vd_ndx",
+     "field_name" : "dli_fbase",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vd_hash",
+     "field_name" : "dli_sname",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "vd_aux",
+     "field_name" : "dli_saddr",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf32_Lib",
+   "name" : "Elf32_Lib",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
+   "unique_id" : "_ZTS9Elf32_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf32_Move",
+   "name" : "Elf32_Move",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf32_Syminfo",
+   "name" : "Elf32_Syminfo",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
    "alignment" : 4,
@@ -1243,18 +1091,18 @@
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf32_Verdaux",
    "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Verdaux"
@@ -1265,105 +1113,46 @@
    [
     {
      "field_name" : "vd_version",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_cnt",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vd_next",
      "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vda_next",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vn_cnt",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vn_file",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vn_aux",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vn_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1371,33 +1160,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1408,36 +1197,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-13"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-32"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1445,33 +1517,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
@@ -1481,313 +1553,112 @@
    "fields" :
    [
     {
-     "field_name" : "dlpi_addr",
-     "referenced_type" : "type-7"
+     "field_name" : "vn_version",
+     "referenced_type" : "type-42"
     },
     {
-     "field_name" : "dlpi_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dlpi_phdr",
-     "field_offset" : 64,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "dlpi_phnum",
-     "field_offset" : 96,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "dl_phdr_info",
-   "name" : "dl_phdr_info",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "dl_phdr_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_addr",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-55"
-    },
-    {
-     "field_name" : "l_ld",
-     "field_offset" : 64,
-     "referenced_type" : "type-120"
-    },
-    {
-     "field_name" : "l_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-121"
-    },
-    {
-     "field_name" : "l_prev",
-     "field_offset" : 128,
-     "referenced_type" : "type-121"
-    }
-   ],
-   "linker_set_key" : "link_map",
-   "name" : "link_map",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "link_map"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_version",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "r_map",
-     "field_offset" : 32,
-     "referenced_type" : "type-121"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "arena",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "ordblks",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "smblks",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "hblks",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "hblkhd",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "usmblks",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fsmblks",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "uordblks",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fordblks",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "keepcost",
-     "field_offset" : 288,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "mallinfo",
-   "name" : "mallinfo",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/malloc.h",
-   "unique_id" : "mallinfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "div_t",
-   "name" : "div_t",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "div_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fpregs",
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "fpsr",
-     "field_offset" : 768,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fpcr",
-     "field_offset" : 800,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "ftype",
-     "field_offset" : 832,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "init_flag",
-     "field_offset" : 896,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "user_fpregs",
-   "name" : "user_fpregs",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 116,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sign1",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "unused",
-     "field_offset" : 1,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sign2",
+     "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-42"
     },
     {
-     "field_name" : "exponent",
-     "field_offset" : 17,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "j",
-     "field_offset" : 31,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "mantissa1",
+     "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "mantissa0",
+     "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vn_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "user_fpregs::fp_reg",
-   "name" : "user_fpregs::fp_reg",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs::fp_reg"
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-89"
+    }
+   ],
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "uregs",
-     "referenced_type" : "type-27"
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-53"
     }
    ],
-   "linker_set_key" : "user_regs",
-   "name" : "user_regs",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 72,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_regs"
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-55"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
   },
   {
    "alignment" : 8,
@@ -1795,17 +1666,17 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "reserved_addr",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "reserved_size",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "relro_fd",
@@ -1830,396 +1701,65 @@
    ],
    "linker_set_key" : "android_dlextinfo",
    "name" : "android_dlextinfo",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 40,
    "source_file" : "/bionic/libc/include/android/dlext.h",
    "unique_id" : "android_dlextinfo"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "fpregs",
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "fpscr",
-     "field_offset" : 2048,
-     "referenced_type" : "type-28"
-    }
-   ],
-   "linker_set_key" : "user_vfp",
-   "name" : "user_vfp",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 264,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_vfp"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "fpexc",
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "fpinst",
-     "field_offset" : 32,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "fpinst2",
-     "field_offset" : 64,
-     "referenced_type" : "type-28"
-    }
-   ],
-   "linker_set_key" : "user_vfp_exc",
-   "name" : "user_vfp_exc",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_vfp_exc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "u_fpvalid",
-     "field_offset" : 576,
+     "field_name" : "quot",
      "referenced_type" : "type-1"
     },
     {
-     "field_name" : "u_tsize",
-     "field_offset" : 608,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_dsize",
-     "field_offset" : 640,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_ssize",
-     "field_offset" : 672,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "start_code",
-     "field_offset" : 704,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "start_stack",
-     "field_offset" : 736,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "signal",
-     "field_offset" : 768,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 800,
+     "field_name" : "rem",
+     "field_offset" : 32,
      "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "u_ar0",
-     "field_offset" : 832,
-     "referenced_type" : "type-37"
-    },
-    {
-     "field_name" : "magic",
-     "field_offset" : 864,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_comm",
-     "field_offset" : 896,
-     "referenced_type" : "type-38"
-    },
-    {
-     "field_name" : "u_debugreg",
-     "field_offset" : 1152,
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_name" : "u_fp",
-     "field_offset" : 1408,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "u_fp0",
-     "field_offset" : 2336,
-     "referenced_type" : "type-41"
     }
    ],
-   "linker_set_key" : "user",
-   "name" : "user",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 296,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 32,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 64,
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "linker_set_key" : "div_t",
+   "name" : "div_t",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "__clang_max_align_nonce2",
-     "field_offset" : 64,
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "max_align_t",
-   "name" : "max_align_t",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 16,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
-   "unique_id" : "_ZTS11max_align_t"
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "div_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "flags",
-     "referenced_type" : "type-7"
+     "field_name" : "dlpi_addr",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "stack_base",
+     "field_name" : "dlpi_name",
      "field_offset" : 32,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "stack_size",
+     "field_name" : "dlpi_phdr",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-107"
     },
     {
-     "field_name" : "guard_size",
+     "field_name" : "dlpi_phnum",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sched_policy",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "sched_priority",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
+     "referenced_type" : "type-42"
     }
    ],
-   "linker_set_key" : "pthread_attr_t",
-   "name" : "pthread_attr_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_attr_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-40"
-    }
-   ],
-   "linker_set_key" : "pthread_barrier_t",
-   "name" : "pthread_barrier_t",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS17pthread_barrier_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "pthread_cond_t",
-   "name" : "pthread_cond_t",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_cond_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "pthread_mutex_t",
-   "name" : "pthread_mutex_t",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS15pthread_mutex_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-70"
-    }
-   ],
-   "linker_set_key" : "pthread_rwlock_t",
-   "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS16pthread_rwlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "pthread_spinlock_t",
-   "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS18pthread_spinlock_t"
+   "linker_set_key" : "dl_phdr_info",
+   "name" : "dl_phdr_info",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "dl_phdr_info"
   },
   {
    "alignment" : 4,
@@ -2232,13 +1772,13 @@
     {
      "field_name" : "d_un",
      "field_offset" : 32,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "dynamic",
    "name" : "dynamic",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS7dynamic"
@@ -2253,63 +1793,179 @@
     },
     {
      "field_name" : "d_ptr",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "record_kind" : "union",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTSN7dynamicUt_E"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-32"
+     "field_name" : "e_ident",
+     "referenced_type" : "type-78"
     },
     {
-     "field_name" : "d_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-42"
     }
    ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
+   "size" : 52,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
+   "unique_id" : "_ZTS9elf32_hdr"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_val",
-     "referenced_type" : "type-31"
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-31"
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
     }
    ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 8,
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
   },
   {
    "alignment" : 4,
@@ -2317,56 +1973,34 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "elf32_rel",
    "name" : "elf32_rel",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf32_rel"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_rel",
-   "name" : "elf64_rel",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_rel"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_addend",
@@ -2376,24 +2010,311 @@
    ],
    "linker_set_key" : "elf32_rela",
    "name" : "elf32_rela",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf32_rela"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_rel",
+   "name" : "elf64_rel",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_rel"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "r_addend",
@@ -2403,53 +2324,174 @@
    ],
    "linker_set_key" : "elf64_rela",
    "name" : "elf64_rela",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 24,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_rela"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 320,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 352,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 384,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_shdr",
+   "name" : "elf64_shdr",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_shdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 48,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "st_name",
-     "referenced_type" : "type-7"
+     "field_name" : "quot",
+     "referenced_type" : "type-17"
     },
     {
-     "field_name" : "st_value",
+     "field_name" : "rem",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-17"
     }
    ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_addr",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_name",
+     "field_offset" : 32,
+     "referenced_type" : "type-47"
+    },
+    {
+     "field_name" : "l_ld",
+     "field_offset" : 64,
+     "referenced_type" : "type-114"
+    },
+    {
+     "field_name" : "l_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-115"
+    },
+    {
+     "field_name" : "l_prev",
+     "field_offset" : 128,
+     "referenced_type" : "type-115"
+    }
+   ],
+   "linker_set_key" : "link_map",
+   "name" : "link_map",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "link_map"
   },
   {
    "alignment" : 8,
@@ -2467,714 +2509,496 @@
    ],
    "linker_set_key" : "lldiv_t",
    "name" : "lldiv_t",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 16,
    "source_file" : "/bionic/libc/include/stdlib.h",
    "unique_id" : "lldiv_t"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-84"
+     "field_name" : "arena",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-84"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "p_offset",
+     "field_name" : "ordblks",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_vaddr",
+     "field_name" : "smblks",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_paddr",
+     "field_name" : "hblks",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_filesz",
+     "field_name" : "hblkhd",
      "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_memsz",
+     "field_name" : "usmblks",
      "field_offset" : 160,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_flags",
+     "field_name" : "fsmblks",
      "field_offset" : 192,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_align",
+     "field_name" : "uordblks",
      "field_offset" : 224,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_filesz",
+     "field_name" : "fordblks",
      "field_offset" : 256,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_entsize",
+     "field_name" : "keepcost",
      "field_offset" : 288,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "linker_set_key" : "mallinfo",
+   "name" : "mallinfo",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
+   "source_file" : "/bionic/libc/include/malloc.h",
+   "unique_id" : "mallinfo"
   },
   {
    "alignment" : 8,
    "fields" :
    [
     {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-7"
+     "field_name" : "__clang_max_align_nonce1",
+     "referenced_type" : "type-32"
     },
     {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_flags",
+     "field_name" : "__clang_max_align_nonce2",
      "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 256,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 320,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 352,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 384,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 448,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-57"
     }
    ],
-   "linker_set_key" : "elf64_shdr",
-   "name" : "elf64_shdr",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-7"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "linker_set_key" : "max_align_t",
+   "name" : "max_align_t",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-31"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
+   "unique_id" : "_ZTS11max_align_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-7"
+     "field_name" : "flags",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_size",
+     "field_name" : "stack_base",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "ch_addralign",
+     "field_name" : "stack_size",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "field_name" : "guard_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "ch_addralign",
+     "field_name" : "sched_policy",
      "field_offset" : 128,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "sched_priority",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
     }
    ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "linker_set_key" : "pthread_attr_t",
+   "name" : "pthread_attr_t",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_attr_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "field_name" : "__private",
+     "referenced_type" : "type-37"
     }
    ],
-   "linker_set_key" : "Elf32_Lib",
-   "name" : "Elf32_Lib",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf32_Lib"
+   "linker_set_key" : "pthread_barrier_t",
+   "name" : "pthread_barrier_t",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS17pthread_barrier_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "field_name" : "__private",
+     "referenced_type" : "type-61"
     }
    ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "linker_set_key" : "pthread_cond_t",
+   "name" : "pthread_cond_t",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_cond_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-61"
+    }
+   ],
+   "linker_set_key" : "pthread_mutex_t",
+   "name" : "pthread_mutex_t",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS15pthread_mutex_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-64"
+    }
+   ],
+   "linker_set_key" : "pthread_rwlock_t",
+   "name" : "pthread_rwlock_t",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS16pthread_rwlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-55"
+    }
+   ],
+   "linker_set_key" : "pthread_spinlock_t",
+   "name" : "pthread_spinlock_t",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS18pthread_spinlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_version",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "r_map",
+     "field_offset" : 32,
+     "referenced_type" : "type-115"
+    },
+    {
+     "field_name" : "r_brk",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "r_state",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "r_ldbase",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "u_fpvalid",
+     "field_offset" : 576,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_tsize",
+     "field_offset" : 608,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_dsize",
+     "field_offset" : 640,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_ssize",
+     "field_offset" : 672,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "start_code",
+     "field_offset" : 704,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "start_stack",
+     "field_offset" : 736,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "signal",
+     "field_offset" : 768,
+     "referenced_type" : "type-17"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 800,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_ar0",
+     "field_offset" : 832,
+     "referenced_type" : "type-34"
+    },
+    {
+     "field_name" : "magic",
+     "field_offset" : 864,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_comm",
+     "field_offset" : 896,
+     "referenced_type" : "type-35"
+    },
+    {
+     "field_name" : "u_debugreg",
+     "field_offset" : 1152,
+     "referenced_type" : "type-37"
+    },
+    {
+     "field_name" : "u_fp",
+     "field_offset" : 1408,
+     "referenced_type" : "type-18"
+    },
+    {
+     "field_name" : "u_fp0",
+     "field_offset" : 2336,
+     "referenced_type" : "type-38"
+    }
+   ],
+   "linker_set_key" : "user",
+   "name" : "user",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
+   "size" : 296,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fpregs",
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "fpsr",
+     "field_offset" : 768,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "fpcr",
+     "field_offset" : 800,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ftype",
+     "field_offset" : 832,
+     "referenced_type" : "type-21"
+    },
+    {
+     "field_name" : "init_flag",
+     "field_offset" : 896,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "user_fpregs",
+   "name" : "user_fpregs",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
+   "size" : 116,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sign1",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "unused",
+     "field_offset" : 1,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sign2",
+     "field_offset" : 16,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "exponent",
+     "field_offset" : 17,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "j",
+     "field_offset" : 31,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "mantissa1",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "mantissa0",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "user_fpregs::fp_reg",
+   "name" : "user_fpregs::fp_reg",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs::fp_reg"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "uregs",
+     "referenced_type" : "type-24"
+    }
+   ],
+   "linker_set_key" : "user_regs",
+   "name" : "user_regs",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
+   "size" : 72,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_regs"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "fpregs",
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "fpscr",
+     "field_offset" : 2048,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "user_vfp",
+   "name" : "user_vfp",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
+   "size" : 264,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_vfp"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fpexc",
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "fpinst",
+     "field_offset" : 32,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "fpinst2",
+     "field_offset" : 64,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "user_vfp_exc",
+   "name" : "user_vfp_exc",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_vfp_exc"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/Q/32/x86/source-based/libdl.so.lsdump b/Q/32/x86/source-based/libdl.so.lsdump
index a815cd1..293c703 100644
--- a/Q/32/x86/source-based/libdl.so.lsdump
+++ b/Q/32/x86/source-based/libdl.so.lsdump
@@ -2,83 +2,11 @@
  "array_types" :
  [
   {
-   "alignment" : 4,
-   "linker_set_key" : "long [32]",
-   "name" : "long [32]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-26",
-   "size" : 128,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long [56]",
-   "name" : "long [56]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-27",
-   "size" : 224,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long [20]",
-   "name" : "long [20]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-23",
-   "size" : 80,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [8]",
-   "name" : "int [8]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-35",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [1]",
-   "name" : "int [1]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-60",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [10]",
-   "name" : "int [10]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-63",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [2]",
-   "name" : "int [2]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [32]",
-   "name" : "unsigned long [32]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-52",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "char [32]",
    "name" : "char [32]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 32,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -86,19 +14,91 @@
    "alignment" : 1,
    "linker_set_key" : "char [4092]",
    "name" : "char [4092]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-41",
+   "referenced_type" : "type-31",
+   "self_type" : "type-38",
    "size" : 4092,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "int [10]",
+   "name" : "int [10]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-57",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [1]",
+   "name" : "int [1]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [2]",
+   "name" : "int [2]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-48",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [8]",
+   "name" : "int [8]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-32",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [20]",
+   "name" : "long [20]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-20",
+   "size" : 80,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [32]",
+   "name" : "long [32]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-23",
+   "size" : 128,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [56]",
+   "name" : "long [56]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-24",
+   "size" : 224,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-75",
-   "self_type" : "type-78",
+   "referenced_type" : "type-69",
+   "self_type" : "type-72",
    "size" : 16,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [32]",
+   "name" : "unsigned long [32]",
+   "referenced_type" : "type-27",
+   "self_type" : "type-46",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
   }
  ],
  "builtin_types" :
@@ -106,20 +106,10 @@
   {
    "alignment" : 1,
    "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1
   },
   {
@@ -136,16 +126,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 8
   },
   {
@@ -153,8 +143,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -163,8 +153,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 1
   },
   {
@@ -173,8 +163,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 4
   },
   {
@@ -183,8 +173,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -193,8 +183,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 8
   },
   {
@@ -203,15 +193,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4"
+   "referenced_type" : "type-5",
+   "self_type" : "type-5"
   }
  ],
  "elf_functions" :
@@ -230,18 +220,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -250,26 +232,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -319,11 +281,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-25",
+   "underlying_type" : "type-22",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -331,57 +293,36 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
-   "name" : "void *(unsigned int, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-11"
-    },
-    {
-     "referenced_type" : "type-11"
-    },
-    {
-     "referenced_type" : "type-6"
-    }
-   ],
-   "referenced_type" : "type-10",
-   "return_type" : "type-5",
-   "self_type" : "type-10",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (dl_phdr_info *, unsigned int, void *)",
    "name" : "int (dl_phdr_info *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-104"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "referenced_type" : "type-109",
+   "referenced_type" : "type-103",
    "return_type" : "type-1",
-   "self_type" : "type-109",
+   "self_type" : "type-103",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, const void *)",
-   "name" : "void *(unsigned int, const void *)",
+   "linker_set_key" : "void (void *, const void *)",
+   "name" : "void (void *, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-7"
     }
    ],
    "referenced_type" : "type-120",
@@ -391,36 +332,36 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned int, const void *)",
-   "name" : "void *(void *, unsigned int, const void *)",
+   "linker_set_key" : "void *(unsigned int, const void *)",
+   "name" : "void *(unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-11"
-    },
-    {
      "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-123",
-   "return_type" : "type-5",
-   "self_type" : "type-123",
+   "referenced_type" : "type-114",
+   "return_type" : "type-4",
+   "self_type" : "type-114",
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const void *)",
-   "name" : "void (void *, const void *)",
+   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
+   "name" : "void *(unsigned int, unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
      "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
    "referenced_type" : "type-3",
@@ -430,21 +371,24 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
+   "linker_set_key" : "void *(void *, unsigned int, const void *)",
+   "name" : "void *(void *, unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-44",
+   "referenced_type" : "type-117",
    "return_type" : "type-4",
-   "self_type" : "type-44",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "self_type" : "type-117",
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "functions" :
@@ -455,16 +399,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-39",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "function_name" : "__cfi_shadow_size",
    "linker_set_key" : "__cfi_shadow_size",
-   "return_type" : "type-11",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -473,13 +417,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -488,77 +432,35 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-20",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     }
    ],
    "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "function_name" : "android_get_LD_LIBRARY_PATH",
@@ -566,13 +468,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-40"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl.cpp"
   },
   {
@@ -582,84 +484,15 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-20",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-43",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-43",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
    "return_type" : "type-1",
@@ -671,10 +504,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-41"
     }
    ],
    "return_type" : "type-1",
@@ -686,7 +519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
    "return_type" : "type-1",
@@ -695,7 +528,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-48",
+   "return_type" : "type-40",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -704,13 +537,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-1"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -719,13 +552,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -734,16 +567,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
@@ -753,27 +586,90 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-106",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-111",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/stdio.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_namespace_t *",
+   "name" : "android_namespace_t *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/android/dlext.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-31",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_dlextinfo *",
+   "name" : "const android_dlextinfo *",
+   "referenced_type" : "type-13",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/android/dlext.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *",
+   "name" : "const char *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const elf32_phdr *",
    "name" : "const elf32_phdr *",
-   "referenced_type" : "type-108",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const void *",
+   "name" : "const void *",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-100",
+   "self_type" : "type-104",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dynamic *",
+   "name" : "dynamic *",
+   "referenced_type" : "type-59",
    "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
@@ -782,8 +678,17 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
    "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "referenced_type" : "type-109",
-   "self_type" : "type-111",
+   "referenced_type" : "type-103",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
   },
@@ -791,71 +696,17 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-42",
+   "referenced_type" : "type-6",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "__sFILE *",
-   "name" : "__sFILE *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, const void *)",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
-   "name" : "void *(*)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android_dlextinfo *",
-   "name" : "const android_dlextinfo *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_namespace_t *",
-   "name" : "android_namespace_t *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "user_fpregs_struct *",
    "name" : "user_fpregs_struct *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-32",
+   "referenced_type" : "type-19",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -863,8 +714,8 @@
    "alignment" : 4,
    "linker_set_key" : "user_regs_struct *",
    "name" : "user_regs_struct *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-31",
+   "referenced_type" : "type-25",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -872,6 +723,33 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *, const void *)",
    "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *",
+   "name" : "void *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-4",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, const void *)",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
@@ -879,155 +757,101 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-48",
+   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
+   "name" : "void *(*)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-5",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dynamic *",
-   "name" : "dynamic *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-6",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "qualified_types" :
  [
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, const void *)",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-11",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-122",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android_dlextinfo",
    "name" : "const android_dlextinfo",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 36,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
-   "referenced_type" : "type-2",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-46",
+   "referenced_type" : "type-31",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-4",
-   "self_type" : "type-7",
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const elf32_phdr",
    "name" : "const elf32_phdr",
-   "referenced_type" : "type-80",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-102",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int",
+   "name" : "const unsigned int",
+   "referenced_type" : "type-6",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const void",
+   "name" : "const void",
+   "referenced_type" : "type-5",
+   "self_type" : "type-8",
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, const void *)",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
    "is_volatile" : true,
    "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
    "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-9",
-   "self_type" : "type-12",
+   "referenced_type" : "type-2",
+   "self_type" : "type-9",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-116",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   }
@@ -1039,47 +863,189 @@
    "fields" :
    [
     {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-25"
+     "field_name" : "v",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_ndx",
+     "field_name" : "padding",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_hash",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-38"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-37",
+   "self_type" : "type-37",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-43"
+    },
+    {
+     "field_name" : "dli_fbase",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "dli_sname",
+     "field_offset" : 64,
+     "referenced_type" : "type-43"
+    },
+    {
+     "field_name" : "dli_saddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf32_Lib",
+   "name" : "Elf32_Lib",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
+   "unique_id" : "_ZTS9Elf32_Lib"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf32_Move",
+   "name" : "Elf32_Move",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf32_Syminfo",
+   "name" : "Elf32_Syminfo",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
    "alignment" : 4,
@@ -1087,58 +1053,68 @@
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "linker_set_key" : "Elf32_Verdaux",
+   "name" : "Elf32_Verdaux",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
+   "unique_id" : "_ZTS13Elf32_Verdaux"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-25"
+     "field_name" : "vd_version",
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_cnt",
+     "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_file",
+     "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_aux",
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vn_next",
+     "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 16,
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
+   "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1146,33 +1122,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1183,36 +1159,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-81"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-6"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-62"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-15"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
+   "size" : 28,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1220,33 +1479,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
@@ -1256,168 +1515,159 @@
    "fields" :
    [
     {
-     "field_name" : "dlpi_addr",
-     "referenced_type" : "type-11"
+     "field_name" : "vn_version",
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "dlpi_name",
+     "field_name" : "vn_cnt",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "dlpi_phdr",
+     "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "dlpi_phnum",
+     "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "dl_phdr_info",
-   "name" : "dl_phdr_info",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "dl_phdr_info"
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_addr",
-     "referenced_type" : "type-11"
+     "field_name" : "a_type",
+     "referenced_type" : "type-15"
     },
     {
-     "field_name" : "l_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "l_ld",
+     "field_name" : "a_un",
      "field_offset" : 64,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "l_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-114"
-    },
-    {
-     "field_name" : "l_prev",
-     "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-83"
     }
    ],
-   "linker_set_key" : "link_map",
-   "name" : "link_map",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "link_map"
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "r_version",
+     "field_name" : "a_val",
+     "referenced_type" : "type-15"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-46"
+    }
+   ],
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "reserved_addr",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "reserved_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "relro_fd",
+     "field_offset" : 128,
      "referenced_type" : "type-1"
     },
     {
-     "field_name" : "r_map",
-     "field_offset" : 32,
-     "referenced_type" : "type-114"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "arena",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ordblks",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "smblks",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "hblks",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "hblkhd",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "usmblks",
+     "field_name" : "library_fd",
      "field_offset" : 160,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-1"
     },
     {
-     "field_name" : "fsmblks",
+     "field_name" : "library_fd_offset",
      "field_offset" : 192,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-16"
     },
     {
-     "field_name" : "uordblks",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "fordblks",
+     "field_name" : "library_namespace",
      "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "keepcost",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-17"
     }
    ],
-   "linker_set_key" : "mallinfo",
-   "name" : "mallinfo",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/malloc.h",
-   "unique_id" : "mallinfo"
+   "linker_set_key" : "android_dlextinfo",
+   "name" : "android_dlextinfo",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
+   "size" : 36,
+   "source_file" : "/bionic/libc/include/android/dlext.h",
+   "unique_id" : "android_dlextinfo"
   },
   {
    "alignment" : 4,
@@ -1435,8 +1685,8 @@
    ],
    "linker_set_key" : "div_t",
    "name" : "div_t",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/bionic/libc/include/stdlib.h",
    "unique_id" : "div_t"
@@ -1446,653 +1696,32 @@
    "fields" :
    [
     {
-     "field_name" : "quot",
-     "referenced_type" : "type-15"
+     "field_name" : "dlpi_addr",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "rem",
+     "field_name" : "dlpi_name",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-43"
     },
     {
-     "field_name" : "reserved_addr",
+     "field_name" : "dlpi_phdr",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-101"
     },
     {
-     "field_name" : "reserved_size",
+     "field_name" : "dlpi_phnum",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "relro_fd",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "library_namespace",
-     "field_offset" : 256,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android_dlextinfo",
-   "name" : "android_dlextinfo",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 36,
-   "source_file" : "/bionic/libc/include/android/dlext.h",
-   "unique_id" : "android_dlextinfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cwd",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "swd",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "twd",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fip",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fcs",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "foo",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fos",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "st_space",
-     "field_offset" : 224,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "user_fpregs_struct",
-   "name" : "user_fpregs_struct",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
-   "size" : 108,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cwd",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "swd",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "twd",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "fop",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "fip",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fcs",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "foo",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fos",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mxcsr",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "st_space",
-     "field_offset" : 256,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "xmm_space",
-     "field_offset" : 1280,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 2304,
-     "referenced_type" : "type-27"
-    }
-   ],
-   "linker_set_key" : "user_fpxregs_struct",
-   "name" : "user_fpxregs_struct",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 512,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpxregs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ebx",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "ecx",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "edx",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "esi",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "edi",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "ebp",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eax",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xds",
-     "field_offset" : 224,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xes",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xfs",
-     "field_offset" : 288,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xgs",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "orig_eax",
-     "field_offset" : 352,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eip",
-     "field_offset" : 384,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xcs",
-     "field_offset" : 416,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eflags",
-     "field_offset" : 448,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "esp",
-     "field_offset" : 480,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xss",
-     "field_offset" : 512,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "user_regs_struct",
-   "name" : "user_regs_struct",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 68,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_regs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_fpvalid",
-     "field_offset" : 544,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "i387",
-     "field_offset" : 576,
      "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "u_tsize",
-     "field_offset" : 1440,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_dsize",
-     "field_offset" : 1472,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_ssize",
-     "field_offset" : 1504,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "start_code",
-     "field_offset" : 1536,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "start_stack",
-     "field_offset" : 1568,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "signal",
-     "field_offset" : 1600,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 1632,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "u_ar0",
-     "field_offset" : 1664,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "u_fpstate",
-     "field_offset" : 1696,
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "magic",
-     "field_offset" : 1728,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_comm",
-     "field_offset" : 1760,
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "u_debugreg",
-     "field_offset" : 2016,
-     "referenced_type" : "type-35"
     }
    ],
-   "linker_set_key" : "user",
-   "name" : "user",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 284,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 32,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 64,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "linker_set_key" : "dl_phdr_info",
+   "name" : "dl_phdr_info",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-52"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "__clang_max_align_nonce2",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "max_align_t",
-   "name" : "max_align_t",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
-   "size" : 16,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
-   "unique_id" : "_ZTS11max_align_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "stack_base",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "stack_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "guard_size",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sched_policy",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "sched_priority",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "pthread_attr_t",
-   "name" : "pthread_attr_t",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_attr_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "pthread_barrier_t",
-   "name" : "pthread_barrier_t",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS17pthread_barrier_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "pthread_cond_t",
-   "name" : "pthread_cond_t",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_cond_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "pthread_mutex_t",
-   "name" : "pthread_mutex_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS15pthread_mutex_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "pthread_rwlock_t",
-   "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS16pthread_rwlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "pthread_spinlock_t",
-   "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS18pthread_spinlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "lldiv_t",
-   "name" : "lldiv_t",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "lldiv_t"
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "dl_phdr_info"
   },
   {
    "alignment" : 4,
@@ -2105,13 +1734,13 @@
     {
      "field_name" : "d_un",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "dynamic",
    "name" : "dynamic",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS7dynamic"
@@ -2126,15 +1755,15 @@
     },
     {
      "field_name" : "d_ptr",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTSN7dynamicUt_E"
@@ -2144,45 +1773,161 @@
    "fields" :
    [
     {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-19"
+     "field_name" : "e_ident",
+     "referenced_type" : "type-72"
     },
     {
-     "field_name" : "d_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-69"
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-22"
     }
    ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 16,
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 52,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
+   "unique_id" : "_ZTS9elf32_hdr"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_val",
-     "referenced_type" : "type-18"
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-18"
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
     }
    ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 8,
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
+   "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
   },
   {
    "alignment" : 4,
@@ -2190,18 +1935,18 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "elf32_rel",
    "name" : "elf32_rel",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf32_rel"
@@ -2212,18 +1957,310 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_addend",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "elf32_rela",
+   "name" : "elf32_rela",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_rela"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-69"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-69"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-72"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-15"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "elf64_rel",
    "name" : "elf64_rel",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 16,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf64_rel"
@@ -2234,50 +2271,23 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_addend",
-     "field_offset" : 64,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "elf32_rela",
-   "name" : "elf32_rela",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_rela"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_addend",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "elf64_rela",
    "name" : "elf64_rela",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 24,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_rela"
@@ -2287,473 +2297,59 @@
    "fields" :
    [
     {
-     "field_name" : "st_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 256,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "sh_name",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_type",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_flags",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_addr",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_offset",
      "field_offset" : 192,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_size",
      "field_offset" : 256,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_link",
      "field_offset" : 320,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_info",
      "field_offset" : 352,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_addralign",
      "field_offset" : 384,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_entsize",
      "field_offset" : 448,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "elf64_shdr",
    "name" : "elf64_shdr",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 64,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_shdr"
@@ -2763,456 +2359,684 @@
    "fields" :
    [
     {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-11"
+     "field_name" : "st_name",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "n_descsz",
+     "field_name" : "st_info",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-69"
     },
     {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-11"
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-69"
     },
     {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-87"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-11"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf32_Lib",
-   "name" : "Elf32_Lib",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf32_Lib"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf32_Move",
-   "name" : "Elf32_Move",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Move"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 28,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf32_Syminfo",
-   "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Syminfo"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_ndx",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_cnt",
+     "field_name" : "st_shndx",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vd_hash",
+     "field_name" : "st_value",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-15"
     },
     {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_next",
+     "field_name" : "st_size",
      "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-15"
     }
    ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-11"
+     "field_name" : "quot",
+     "referenced_type" : "type-12"
     },
     {
-     "field_name" : "vda_next",
+     "field_name" : "rem",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-12"
     }
    ],
-   "linker_set_key" : "Elf32_Verdaux",
-   "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verdaux"
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_addr",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_name",
+     "field_offset" : 32,
+     "referenced_type" : "type-40"
+    },
+    {
+     "field_name" : "l_ld",
+     "field_offset" : 64,
+     "referenced_type" : "type-107"
+    },
+    {
+     "field_name" : "l_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-108"
+    },
+    {
+     "field_name" : "l_prev",
+     "field_offset" : 128,
+     "referenced_type" : "type-108"
+    }
+   ],
+   "linker_set_key" : "link_map",
+   "name" : "link_map",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "link_map"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "quot",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "rem",
+     "field_offset" : 64,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "linker_set_key" : "lldiv_t",
+   "name" : "lldiv_t",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "lldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "arena",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ordblks",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "smblks",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "hblks",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "hblkhd",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "usmblks",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "fsmblks",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "uordblks",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "fordblks",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "keepcost",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "mallinfo",
+   "name" : "mallinfo",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/malloc.h",
+   "unique_id" : "mallinfo"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "__clang_max_align_nonce1",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "__clang_max_align_nonce2",
+     "field_offset" : 64,
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "max_align_t",
+   "name" : "max_align_t",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
+   "size" : 16,
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
+   "unique_id" : "_ZTS11max_align_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "stack_base",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "stack_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "guard_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sched_policy",
+     "field_offset" : 128,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "sched_priority",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "pthread_attr_t",
+   "name" : "pthread_attr_t",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_attr_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-32"
+    }
+   ],
+   "linker_set_key" : "pthread_barrier_t",
+   "name" : "pthread_barrier_t",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS17pthread_barrier_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "pthread_cond_t",
+   "name" : "pthread_cond_t",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_cond_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "pthread_mutex_t",
+   "name" : "pthread_mutex_t",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS15pthread_mutex_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-57"
+    }
+   ],
+   "linker_set_key" : "pthread_rwlock_t",
+   "name" : "pthread_rwlock_t",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS16pthread_rwlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "pthread_spinlock_t",
+   "name" : "pthread_spinlock_t",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS18pthread_spinlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_version",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "r_map",
+     "field_offset" : 32,
+     "referenced_type" : "type-108"
+    },
+    {
+     "field_name" : "r_brk",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_state",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_ldbase",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_fpvalid",
+     "field_offset" : 544,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "i387",
+     "field_offset" : 576,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "u_tsize",
+     "field_offset" : 1440,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_dsize",
+     "field_offset" : 1472,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_ssize",
+     "field_offset" : 1504,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "start_code",
+     "field_offset" : 1536,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "start_stack",
+     "field_offset" : 1568,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "signal",
+     "field_offset" : 1600,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 1632,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_ar0",
+     "field_offset" : 1664,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "u_fpstate",
+     "field_offset" : 1696,
+     "referenced_type" : "type-29"
+    },
+    {
+     "field_name" : "magic",
+     "field_offset" : 1728,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_comm",
+     "field_offset" : 1760,
+     "referenced_type" : "type-30"
+    },
+    {
+     "field_name" : "u_debugreg",
+     "field_offset" : 2016,
+     "referenced_type" : "type-32"
+    }
+   ],
+   "linker_set_key" : "user",
+   "name" : "user",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
+   "size" : 284,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "cwd",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "swd",
+     "field_offset" : 32,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "twd",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fip",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fcs",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "foo",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fos",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "st_space",
+     "field_offset" : 224,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "user_fpregs_struct",
+   "name" : "user_fpregs_struct",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
+   "size" : 108,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs_struct"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "cwd",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "swd",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "twd",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "fop",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "fip",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fcs",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "foo",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fos",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "mxcsr",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 224,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "st_space",
+     "field_offset" : 256,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "xmm_space",
+     "field_offset" : 1280,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "padding",
+     "field_offset" : 2304,
+     "referenced_type" : "type-24"
+    }
+   ],
+   "linker_set_key" : "user_fpxregs_struct",
+   "name" : "user_fpxregs_struct",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
+   "size" : 512,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpxregs_struct"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ebx",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "ecx",
+     "field_offset" : 32,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "edx",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "esi",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "edi",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "ebp",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eax",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xds",
+     "field_offset" : 224,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xes",
+     "field_offset" : 256,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xfs",
+     "field_offset" : 288,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xgs",
+     "field_offset" : 320,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "orig_eax",
+     "field_offset" : 352,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eip",
+     "field_offset" : 384,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xcs",
+     "field_offset" : 416,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eflags",
+     "field_offset" : 448,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "esp",
+     "field_offset" : 480,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xss",
+     "field_offset" : 512,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "user_regs_struct",
+   "name" : "user_regs_struct",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
+   "size" : 68,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_regs_struct"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/Q/64/arm64_armv8-a/source-based/libdl.so.lsdump b/Q/64/arm64_armv8-a/source-based/libdl.so.lsdump
index 9716908..44eafc1 100644
--- a/Q/64/arm64_armv8-a/source-based/libdl.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libdl.so.lsdump
@@ -2,11 +2,29 @@
  "array_types" :
  [
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-31",
+   "self_type" : "type-50",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4088]",
+   "name" : "char [4088]",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
+   "size" : 4088,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
    "alignment" : 4,
    "linker_set_key" : "int [10]",
    "name" : "int [10]",
    "referenced_type" : "type-1",
-   "self_type" : "type-62",
+   "self_type" : "type-56",
    "size" : 40,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h"
   },
@@ -15,7 +33,7 @@
    "linker_set_key" : "int [12]",
    "name" : "int [12]",
    "referenced_type" : "type-1",
-   "self_type" : "type-60",
+   "self_type" : "type-54",
    "size" : 48,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h"
   },
@@ -24,7 +42,7 @@
    "linker_set_key" : "int [14]",
    "name" : "int [14]",
    "referenced_type" : "type-1",
-   "self_type" : "type-65",
+   "self_type" : "type-58",
    "size" : 56,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h"
   },
@@ -33,25 +51,43 @@
    "linker_set_key" : "int [2]",
    "name" : "int [2]",
    "referenced_type" : "type-1",
-   "self_type" : "type-51",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
   },
   {
+   "alignment" : 8,
+   "linker_set_key" : "long [4]",
+   "name" : "long [4]",
+   "referenced_type" : "type-35",
+   "self_type" : "type-52",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
    "alignment" : 16,
    "linker_set_key" : "unsigned __int128 [32]",
    "name" : "unsigned __int128 [32]",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "type-22",
+   "self_type" : "type-21",
    "size" : 512,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [16]",
+   "name" : "unsigned char [16]",
+   "referenced_type" : "type-72",
+   "self_type" : "type-75",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
    "alignment" : 8,
    "linker_set_key" : "unsigned long [16]",
    "name" : "unsigned long [16]",
    "referenced_type" : "type-2",
-   "self_type" : "type-49",
+   "self_type" : "type-43",
    "size" : 128,
    "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
   },
@@ -60,45 +96,9 @@
    "linker_set_key" : "unsigned long [31]",
    "name" : "unsigned long [31]",
    "referenced_type" : "type-2",
-   "self_type" : "type-22",
+   "self_type" : "type-19",
    "size" : 248,
    "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-56",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4088]",
-   "name" : "char [4088]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 4088,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long [4]",
-   "name" : "long [4]",
-   "referenced_type" : "type-38",
-   "self_type" : "type-58",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-78",
-   "self_type" : "type-81",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
   }
  ],
  "builtin_types" :
@@ -107,20 +107,10 @@
    "alignment" : 1,
    "is_integral" : true,
    "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1
   },
   {
@@ -137,16 +127,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 8
   },
   {
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 16
   },
   {
@@ -154,8 +144,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 8
   },
   {
@@ -164,8 +154,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned __int128",
    "name" : "unsigned __int128",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 16
   },
   {
@@ -174,8 +164,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 1
   },
   {
@@ -184,8 +174,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
@@ -204,8 +194,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 8
   },
   {
@@ -214,8 +204,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 2
   },
   {
@@ -241,18 +231,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -261,26 +243,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -330,11 +292,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-31",
+   "underlying_type" : "type-28",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -342,33 +304,12 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned long, const void *)",
-   "name" : "void *(void *, unsigned long, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-6"
-    }
-   ],
-   "referenced_type" : "type-11",
-   "return_type" : "type-4",
-   "self_type" : "type-11",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (dl_phdr_info *, unsigned long, void *)",
    "name" : "int (dl_phdr_info *, unsigned long, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-108"
     },
     {
      "referenced_type" : "type-2"
@@ -377,9 +318,9 @@
      "referenced_type" : "type-4"
     }
    ],
-   "referenced_type" : "type-113",
+   "referenced_type" : "type-107",
    "return_type" : "type-1",
-   "self_type" : "type-113",
+   "self_type" : "type-107",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
@@ -395,9 +336,27 @@
      "referenced_type" : "type-6"
     }
    ],
-   "referenced_type" : "type-14",
+   "referenced_type" : "type-11",
    "return_type" : "type-5",
-   "self_type" : "type-14",
+   "self_type" : "type-11",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(unsigned long, const void *)",
+   "name" : "void *(unsigned long, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-6"
+    }
+   ],
+   "referenced_type" : "type-118",
+   "return_type" : "type-4",
+   "self_type" : "type-118",
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
@@ -416,18 +375,21 @@
      "referenced_type" : "type-6"
     }
    ],
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-14",
    "return_type" : "type-4",
-   "self_type" : "type-17",
+   "self_type" : "type-14",
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned long, const void *)",
-   "name" : "void *(unsigned long, const void *)",
+   "linker_set_key" : "void *(void *, unsigned long, const void *)",
+   "name" : "void *(void *, unsigned long, const void *)",
    "parameters" :
    [
     {
+     "referenced_type" : "type-4"
+    },
+    {
      "referenced_type" : "type-2"
     },
     {
@@ -438,24 +400,6 @@
    "return_type" : "type-4",
    "self_type" : "type-3",
    "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-42"
-    }
-   ],
-   "referenced_type" : "type-41",
-   "return_type" : "type-5",
-   "self_type" : "type-41",
-   "source_file" : "/bionic/libdl/libdl.cpp"
   }
  ],
  "functions" :
@@ -469,7 +413,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-35",
+   "return_type" : "type-32",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -512,72 +456,30 @@
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-42"
-    },
-    {
-     "referenced_type" : "type-42"
-    },
-    {
-     "referenced_type" : "type-42"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-42"
-    },
-    {
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-18",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-40"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-36"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_get_LD_LIBRARY_PATH",
    "linker_set_key" : "android_get_LD_LIBRARY_PATH",
    "parameters" :
    [
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-37"
     },
     {
      "referenced_type" : "type-2"
@@ -593,81 +495,12 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-18",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-42"
-    },
-    {
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-40",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-40",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-42"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-109"
     },
     {
      "referenced_type" : "type-4"
@@ -685,7 +518,7 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-38"
     }
    ],
    "return_type" : "type-1",
@@ -706,7 +539,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-44",
+   "return_type" : "type-37",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -715,7 +548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-40"
     },
     {
      "referenced_type" : "type-1"
@@ -733,7 +566,7 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-40"
     }
    ],
    "return_type" : "type-4",
@@ -748,10 +581,10 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-40"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-40"
     }
    ],
    "return_type" : "type-4",
@@ -764,109 +597,46 @@
  [
   {
    "alignment" : 8,
-   "linker_set_key" : "void *(*)(void *, unsigned long, const void *)",
-   "name" : "void *(*)(void *, unsigned long, const void *)",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const elf64_phdr *",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "type-112",
+   "linker_set_key" : "Elf64_Dyn *",
+   "name" : "Elf64_Dyn *",
+   "referenced_type" : "type-63",
    "self_type" : "type-111",
    "size" : 8,
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned long, void *)",
-   "name" : "int (*)(dl_phdr_info *, unsigned long, void *)",
-   "referenced_type" : "type-113",
-   "self_type" : "type-115",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-118",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "type-115",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(void *, const void *)",
-   "name" : "void (*)(void *, const void *)",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *(*)(unsigned long, unsigned long, const void *)",
-   "name" : "void *(*)(unsigned long, unsigned long, const void *)",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android_namespace_t *",
    "name" : "android_namespace_t *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 8,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "unsigned long *",
-   "name" : "unsigned long *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-35",
-   "size" : 8,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *(*)(unsigned long, const void *)",
-   "name" : "void *(*)(unsigned long, const void *)",
-   "referenced_type" : "type-3",
-   "self_type" : "type-9",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-44",
+   "referenced_type" : "type-31",
+   "self_type" : "type-37",
    "size" : 8,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
@@ -874,40 +644,85 @@
    "alignment" : 8,
    "linker_set_key" : "const android_dlextinfo *",
    "name" : "const android_dlextinfo *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-33",
+   "self_type" : "type-36",
    "size" : 8,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-41",
-   "self_type" : "type-45",
-   "size" : 8,
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "linker_set_key" : "const elf64_phdr *",
+   "name" : "const elf64_phdr *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-105",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const void *",
+   "name" : "const void *",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 8,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-104",
+   "self_type" : "type-108",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned long, void *)",
+   "name" : "int (*)(dl_phdr_info *, unsigned long, void *)",
+   "referenced_type" : "type-107",
+   "self_type" : "type-109",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-110",
+   "self_type" : "type-112",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long *",
+   "name" : "unsigned long *",
+   "referenced_type" : "type-2",
+   "self_type" : "type-32",
+   "size" : 8,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(void *, const void *)",
+   "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
    "referenced_type" : "type-5",
@@ -917,62 +732,71 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "Elf64_Dyn *",
-   "name" : "Elf64_Dyn *",
-   "referenced_type" : "type-69",
+   "linker_set_key" : "void *(*)(unsigned long, const void *)",
+   "name" : "void *(*)(unsigned long, const void *)",
+   "referenced_type" : "type-118",
    "self_type" : "type-117",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-6",
+   "linker_set_key" : "void *(*)(unsigned long, unsigned long, const void *)",
+   "name" : "void *(*)(unsigned long, unsigned long, const void *)",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *(*)(void *, unsigned long, const void *)",
+   "name" : "void *(*)(void *, unsigned long, const void *)",
+   "referenced_type" : "type-3",
+   "self_type" : "type-9",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "qualified_types" :
  [
   {
    "alignment" : 8,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned long, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned long, const void *)",
-   "referenced_type" : "type-10",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
+   "is_const" : true,
+   "linker_set_key" : "const android_dlextinfo",
+   "name" : "const android_dlextinfo",
+   "referenced_type" : "type-34",
+   "self_type" : "type-33",
+   "size" : 48,
+   "source_file" : "/bionic/libc/include/android/dlext.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const char",
+   "name" : "const char",
+   "referenced_type" : "type-31",
+   "self_type" : "type-41",
+   "size" : 1,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 8,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
-   "name" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
-   "referenced_type" : "type-16",
-   "self_type" : "type-20",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
+   "is_const" : true,
+   "linker_set_key" : "const elf64_phdr",
+   "name" : "const elf64_phdr",
+   "referenced_type" : "type-78",
+   "self_type" : "type-106",
+   "size" : 56,
+   "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-26",
-   "self_type" : "type-27",
+   "referenced_type" : "type-23",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/bionic/libc/private/CFIShadow.h"
   },
@@ -982,31 +806,11 @@
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
    "referenced_type" : "type-2",
-   "self_type" : "type-28",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/bionic/libc/private/CFIShadow.h"
   },
   {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android_dlextinfo",
-   "name" : "const android_dlextinfo",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
-   "size" : 48,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
@@ -1016,19 +820,39 @@
   },
   {
    "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const elf64_phdr",
-   "name" : "const elf64_phdr",
-   "referenced_type" : "type-84",
-   "self_type" : "type-112",
-   "size" : 56,
-   "source_file" : "/bionic/libc/include/link.h"
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-10",
+   "self_type" : "type-12",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 8,
    "is_volatile" : true,
    "linker_set_key" : "void *(*volatile)(unsigned long, const void *)",
    "name" : "void *(*volatile)(unsigned long, const void *)",
+   "referenced_type" : "type-117",
+   "self_type" : "type-119",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
+   "name" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
+   "referenced_type" : "type-13",
+   "self_type" : "type-15",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned long, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned long, const void *)",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
    "size" : 8,
@@ -1038,95 +862,193 @@
  "record_types" :
  [
   {
-   "alignment" : 2,
+   "alignment" : 8,
    "fields" :
    [
     {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-31"
+     "field_name" : "v",
+     "referenced_type" : "type-2"
     },
     {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-31"
+     "field_name" : "padding",
+     "field_offset" : 64,
+     "referenced_type" : "type-30"
     }
    ],
-   "linker_set_key" : "Elf32_Syminfo",
-   "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Syminfo"
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
   },
   {
-   "alignment" : 2,
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-31"
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-40"
     },
     {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-31"
+     "field_name" : "dli_fbase",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "dli_sname",
+     "field_offset" : 128,
+     "referenced_type" : "type-40"
+    },
+    {
+     "field_name" : "dli_saddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
     }
    ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-31"
+     "field_name" : "ch_type",
+     "referenced_type" : "type-23"
     },
     {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "vd_ndx",
+     "field_name" : "ch_size",
      "field_offset" : 32,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-23"
     },
     {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "vd_hash",
+     "field_name" : "ch_addralign",
      "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     }
    ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "Elf32_Lib",
+   "name" : "Elf32_Lib",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
+   "unique_id" : "_ZTS9Elf32_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 96,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 144,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "Elf32_Move",
+   "name" : "Elf32_Move",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "Elf32_Syminfo",
+   "name" : "Elf32_Syminfo",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
    "alignment" : 4,
@@ -1134,18 +1056,18 @@
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "Elf32_Verdaux",
    "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Verdaux"
@@ -1156,105 +1078,46 @@
    [
     {
      "field_name" : "vd_version",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vd_cnt",
      "field_offset" : 48,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vd_next",
      "field_offset" : 128,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "vda_next",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "vn_cnt",
-     "field_offset" : 16,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "vn_file",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "vn_aux",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "vn_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1262,33 +1125,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1299,36 +1162,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-84"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-23"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-65"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-47"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-64"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-65"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1336,102 +1482,978 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vn_version",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "vn_cnt",
+     "field_offset" : 16,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "vn_file",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "vn_aux",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "vn_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-86"
+    }
+   ],
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-65"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-43"
+    }
+   ],
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-45"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "reserved_addr",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "reserved_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "relro_fd",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "library_fd",
+     "field_offset" : 224,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "library_fd_offset",
+     "field_offset" : 256,
+     "referenced_type" : "type-35"
+    },
+    {
+     "field_name" : "library_namespace",
+     "field_offset" : 320,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "linker_set_key" : "android_dlextinfo",
+   "name" : "android_dlextinfo",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
+   "size" : 48,
+   "source_file" : "/bionic/libc/include/android/dlext.h",
+   "unique_id" : "android_dlextinfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "quot",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "rem",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "div_t",
+   "name" : "div_t",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "div_t"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "dlpi_addr",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-65"
     },
     {
      "field_name" : "dlpi_name",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-40"
     },
     {
      "field_name" : "dlpi_phdr",
      "field_offset" : 128,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "dlpi_phnum",
      "field_offset" : 192,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "dl_phdr_info",
    "name" : "dl_phdr_info",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h",
    "unique_id" : "dl_phdr_info"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-62"
+    }
+   ],
+   "linker_set_key" : "dynamic",
+   "name" : "dynamic",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS7dynamic"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-23"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
+   "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 4,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN7dynamicUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-75"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 52,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "elf32_rel",
+   "name" : "elf32_rel",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_rel"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "r_addend",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "elf32_rela",
+   "name" : "elf32_rela",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_rela"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-72"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-72"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-75"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-65"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-65"
+    }
+   ],
+   "linker_set_key" : "elf64_rel",
+   "name" : "elf64_rel",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_rel"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "r_addend",
+     "field_offset" : 128,
+     "referenced_type" : "type-47"
+    }
+   ],
+   "linker_set_key" : "elf64_rela",
+   "name" : "elf64_rela",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_rela"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 128,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 192,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 256,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 320,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 352,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 384,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 448,
+     "referenced_type" : "type-65"
+    }
+   ],
+   "linker_set_key" : "elf64_shdr",
+   "name" : "elf64_shdr",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_shdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-72"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-72"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 48,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 64,
+     "referenced_type" : "type-65"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-65"
+    }
+   ],
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "quot",
+     "referenced_type" : "type-35"
+    },
+    {
+     "field_name" : "rem",
+     "field_offset" : 64,
+     "referenced_type" : "type-35"
+    }
+   ],
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "l_addr",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-65"
     },
     {
      "field_name" : "l_name",
      "field_offset" : 64,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-37"
     },
     {
      "field_name" : "l_ld",
      "field_offset" : 128,
-     "referenced_type" : "type-117"
+     "referenced_type" : "type-111"
     },
     {
      "field_name" : "l_next",
      "field_offset" : 192,
-     "referenced_type" : "type-118"
+     "referenced_type" : "type-112"
     },
     {
      "field_name" : "l_prev",
      "field_offset" : 256,
-     "referenced_type" : "type-118"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "link_map",
    "name" : "link_map",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
+   "referenced_type" : "type-110",
+   "self_type" : "type-110",
    "size" : 40,
    "source_file" : "/bionic/libc/include/link.h",
    "unique_id" : "link_map"
@@ -1441,37 +2463,22 @@
    "fields" :
    [
     {
-     "field_name" : "r_version",
-     "referenced_type" : "type-1"
+     "field_name" : "quot",
+     "referenced_type" : "type-47"
     },
     {
-     "field_name" : "r_map",
+     "field_name" : "rem",
      "field_offset" : 64,
-     "referenced_type" : "type-118"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 192,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 256,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-47"
     }
    ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
+   "linker_set_key" : "lldiv_t",
+   "name" : "lldiv_t",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "lldiv_t"
   },
   {
    "alignment" : 8,
@@ -1529,238 +2536,32 @@
    ],
    "linker_set_key" : "mallinfo",
    "name" : "mallinfo",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 80,
    "source_file" : "/bionic/libc/include/malloc.h",
    "unique_id" : "mallinfo"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "sp",
-     "field_offset" : 1984,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pc",
-     "field_offset" : 2048,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "pstate",
-     "field_offset" : 2112,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "user_regs_struct",
-   "name" : "user_regs_struct",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 272,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_regs_struct"
-  },
-  {
-   "alignment" : 16,
-   "fields" :
-   [
-    {
-     "field_name" : "vregs",
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "fpsr",
-     "field_offset" : 4096,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "fpcr",
-     "field_offset" : 4128,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "user_fpsimd_struct",
-   "name" : "user_fpsimd_struct",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 528,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpsimd_struct"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 64,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved_addr",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "relro_fd",
-     "field_offset" : 192,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd",
-     "field_offset" : 224,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd_offset",
-     "field_offset" : 256,
-     "referenced_type" : "type-38"
-    },
-    {
-     "field_name" : "library_namespace",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android_dlextinfo",
-   "name" : "android_dlextinfo",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
-   "size" : 48,
-   "source_file" : "/bionic/libc/include/android/dlext.h",
-   "unique_id" : "android_dlextinfo"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-42"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 128,
-     "referenced_type" : "type-42"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-49"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-51"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
    "alignment" : 16,
    "fields" :
    [
     {
      "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-47"
     },
     {
      "field_name" : "__clang_max_align_nonce2",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-48"
     }
    ],
    "linker_set_key" : "max_align_t",
    "name" : "max_align_t",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 32,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
    "unique_id" : "_ZTS11max_align_t"
   },
   {
@@ -1769,7 +2570,7 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "stack_base",
@@ -1799,13 +2600,13 @@
     {
      "field_name" : "__reserved",
      "field_offset" : 320,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "pthread_attr_t",
    "name" : "pthread_attr_t",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 56,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h",
    "unique_id" : "_ZTS14pthread_attr_t"
@@ -1816,13 +2617,13 @@
    [
     {
      "field_name" : "__private",
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "pthread_barrier_t",
    "name" : "pthread_barrier_t",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 32,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h",
    "unique_id" : "_ZTS17pthread_barrier_t"
@@ -1833,13 +2634,13 @@
    [
     {
      "field_name" : "__private",
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "pthread_cond_t",
    "name" : "pthread_cond_t",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 48,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h",
    "unique_id" : "_ZTS14pthread_cond_t"
@@ -1850,13 +2651,13 @@
    [
     {
      "field_name" : "__private",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "pthread_mutex_t",
    "name" : "pthread_mutex_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 40,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h",
    "unique_id" : "_ZTS15pthread_mutex_t"
@@ -1866,36 +2667,14 @@
    "fields" :
    [
     {
-     "field_name" : "quot",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "div_t",
-   "name" : "div_t",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "div_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "__private",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "pthread_rwlock_t",
    "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 56,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h",
    "unique_id" : "_ZTS16pthread_rwlock_t"
@@ -1906,1067 +2685,112 @@
    [
     {
      "field_name" : "__private",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-35"
     }
    ],
    "linker_set_key" : "pthread_spinlock_t",
    "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 8,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h",
    "unique_id" : "_ZTS18pthread_spinlock_t"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "fields" :
    [
     {
-     "field_name" : "d_tag",
+     "field_name" : "r_version",
      "referenced_type" : "type-1"
     },
     {
-     "field_name" : "d_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "dynamic",
-   "name" : "dynamic",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS7dynamic"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "d_val",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-26"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
-   "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN7dynamicUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-53"
-    },
-    {
-     "field_name" : "d_un",
+     "field_name" : "r_map",
      "field_offset" : 64,
-     "referenced_type" : "type-70"
-    }
-   ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "d_val",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-112"
     },
     {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "elf32_rel",
-   "name" : "elf32_rel",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_rel"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-38"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 64,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "elf64_rel",
-   "name" : "elf64_rel",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_rel"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "r_addend",
-     "field_offset" : 64,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "elf32_rela",
-   "name" : "elf32_rela",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_rela"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "r_addend",
+     "field_name" : "r_brk",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "linker_set_key" : "elf64_rela",
-   "name" : "elf64_rela",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_rela"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-65"
     },
     {
-     "field_name" : "st_value",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-81"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "e_entry",
+     "field_name" : "r_state",
      "field_offset" : 192,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     },
     {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "e_shoff",
+     "field_name" : "r_ldbase",
      "field_offset" : 256,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-65"
     }
    ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-81"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 128,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 160,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 192,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 224,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 256,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 288,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 16,
+   "fields" :
+   [
+    {
+     "field_name" : "vregs",
+     "referenced_type" : "type-21"
+    },
+    {
+     "field_name" : "fpsr",
+     "field_offset" : 4096,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "fpcr",
+     "field_offset" : 4128,
+     "referenced_type" : "type-23"
+    }
+   ],
+   "linker_set_key" : "user_fpsimd_struct",
+   "name" : "user_fpsimd_struct",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
+   "size" : 528,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpsimd_struct"
   },
   {
    "alignment" : 8,
    "fields" :
    [
     {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-26"
+     "field_name" : "regs",
+     "referenced_type" : "type-19"
     },
     {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
+     "field_name" : "sp",
+     "field_offset" : 1984,
+     "referenced_type" : "type-2"
     },
     {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
+     "field_name" : "pc",
+     "field_offset" : 2048,
+     "referenced_type" : "type-2"
     },
     {
-     "field_name" : "sh_addr",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 256,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 320,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 352,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 384,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 448,
-     "referenced_type" : "type-71"
+     "field_name" : "pstate",
+     "field_offset" : 2112,
+     "referenced_type" : "type-2"
     }
    ],
-   "linker_set_key" : "elf64_shdr",
-   "name" : "elf64_shdr",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-26"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-92"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-71"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-53"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 64,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "linker_set_key" : "lldiv_t",
-   "name" : "lldiv_t",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "lldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "Elf32_Lib",
-   "name" : "Elf32_Lib",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf32_Lib"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-26"
-    }
-   ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 96,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 144,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "Elf32_Move",
-   "name" : "Elf32_Move",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Move"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-71"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
+   "linker_set_key" : "user_regs_struct",
+   "name" : "user_regs_struct",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
+   "size" : 272,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_regs_struct"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/Q/64/arm_armv7-a-neon/source-based/libdl.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libdl.so.lsdump
index bf74827..7b1ea3f 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libdl.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libdl.so.lsdump
@@ -2,101 +2,11 @@
  "array_types" :
  [
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [8]",
-   "name" : "int [8]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-40",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [1]",
-   "name" : "int [1]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [10]",
-   "name" : "int [10]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-70",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [2]",
-   "name" : "int [2]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-61",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_fpregs::fp_reg [8]",
-   "name" : "user_fpregs::fp_reg [8]",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 96,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-25",
-   "self_type" : "type-84",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [8]",
-   "name" : "unsigned char [8]",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [32]",
-   "name" : "unsigned long [32]",
-   "referenced_type" : "type-28",
-   "self_type" : "type-59",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [18]",
-   "name" : "unsigned long [18]",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 72,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long long [32]",
-   "name" : "unsigned long long [32]",
-   "referenced_type" : "type-31",
-   "self_type" : "type-34",
-   "size" : 256,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "char [32]",
    "name" : "char [32]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-36",
+   "self_type" : "type-35",
    "size" : 32,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -104,10 +14,100 @@
    "alignment" : 1,
    "linker_set_key" : "char [4092]",
    "name" : "char [4092]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-48",
+   "referenced_type" : "type-36",
+   "self_type" : "type-44",
    "size" : 4092,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [10]",
+   "name" : "int [10]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-64",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [1]",
+   "name" : "int [1]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-61",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [2]",
+   "name" : "int [2]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-55",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [8]",
+   "name" : "int [8]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-37",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [16]",
+   "name" : "unsigned char [16]",
+   "referenced_type" : "type-22",
+   "self_type" : "type-78",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [8]",
+   "name" : "unsigned char [8]",
+   "referenced_type" : "type-22",
+   "self_type" : "type-21",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [18]",
+   "name" : "unsigned long [18]",
+   "referenced_type" : "type-25",
+   "self_type" : "type-24",
+   "size" : 72,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [32]",
+   "name" : "unsigned long [32]",
+   "referenced_type" : "type-25",
+   "self_type" : "type-53",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long long [32]",
+   "name" : "unsigned long long [32]",
+   "referenced_type" : "type-28",
+   "self_type" : "type-27",
+   "size" : 256,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_fpregs::fp_reg [8]",
+   "name" : "user_fpregs::fp_reg [8]",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
+   "size" : 96,
+   "source_file" : "/bionic/libc/include/sys/user.h"
   }
  ],
  "builtin_types" :
@@ -116,20 +116,10 @@
    "alignment" : 1,
    "is_integral" : true,
    "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1
   },
   {
@@ -146,16 +136,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 8
   },
   {
@@ -173,8 +163,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1
   },
   {
@@ -183,8 +173,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 4
   },
   {
@@ -193,8 +183,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -203,8 +193,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 8
   },
   {
@@ -213,15 +203,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
+   "referenced_type" : "type-5",
+   "self_type" : "type-5"
   }
  ],
  "elf_functions" :
@@ -240,18 +230,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -260,26 +242,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -333,11 +295,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-45",
+   "underlying_type" : "type-42",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -350,91 +312,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-110"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "referenced_type" : "type-115",
+   "referenced_type" : "type-109",
    "return_type" : "type-1",
-   "self_type" : "type-115",
+   "self_type" : "type-109",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, const void *)",
-   "name" : "void *(unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-127",
-   "return_type" : "type-5",
-   "self_type" : "type-127",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (void *, const void *)",
    "name" : "void (void *, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-13",
-   "return_type" : "type-6",
-   "self_type" : "type-13",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
-   "name" : "void *(unsigned int, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     },
     {
      "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-16",
-   "return_type" : "type-5",
-   "self_type" : "type-16",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned int, const void *)",
-   "name" : "void *(void *, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
     }
    ],
    "referenced_type" : "type-4",
@@ -444,21 +346,63 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
+   "linker_set_key" : "void *(unsigned int, const void *)",
+   "name" : "void *(unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-51",
+   "referenced_type" : "type-121",
    "return_type" : "type-6",
-   "self_type" : "type-51",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "self_type" : "type-121",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
+   "name" : "void *(unsigned int, unsigned int, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "referenced_type" : "type-12",
+   "return_type" : "type-6",
+   "self_type" : "type-12",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(void *, unsigned int, const void *)",
+   "name" : "void *(void *, unsigned int, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "referenced_type" : "type-124",
+   "return_type" : "type-6",
+   "self_type" : "type-124",
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "functions" :
@@ -469,16 +413,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-49",
+   "return_type" : "type-45",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "function_name" : "__cfi_shadow_size",
    "linker_set_key" : "__cfi_shadow_size",
-   "return_type" : "type-7",
+   "return_type" : "type-13",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -487,13 +431,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -502,52 +446,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-31"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
      "referenced_type" : "type-1"
@@ -556,23 +473,8 @@
      "referenced_type" : "type-46"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-54"
-    }
-   ],
    "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "function_name" : "android_get_LD_LIBRARY_PATH",
@@ -580,13 +482,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-47"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl.cpp"
   },
   {
@@ -596,84 +498,15 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-117"
+     "referenced_type" : "type-111"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
    "return_type" : "type-1",
@@ -685,13 +518,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-118"
+     "referenced_type" : "type-112"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-13",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
@@ -700,10 +533,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-48"
     }
    ],
    "return_type" : "type-1",
@@ -715,7 +548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
    "return_type" : "type-1",
@@ -724,7 +557,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-55",
+   "return_type" : "type-47",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -733,13 +566,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
      "referenced_type" : "type-1"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -748,13 +581,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -763,16 +596,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
@@ -782,114 +615,24 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-118",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const elf32_phdr *",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "referenced_type" : "type-115",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, const void *)",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const void *)",
-   "name" : "void (*)(void *, const void *)",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_fpregs *",
-   "name" : "user_fpregs *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-41",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_regs *",
-   "name" : "user_regs *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android_dlextinfo *",
-   "name" : "const android_dlextinfo *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android_namespace_t *",
    "name" : "android_namespace_t *",
    "referenced_type" : "type-3",
@@ -901,71 +644,35 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-55",
+   "referenced_type" : "type-36",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
-   "name" : "void *(*)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-11",
+   "linker_set_key" : "const android_dlextinfo *",
+   "name" : "const android_dlextinfo *",
+   "referenced_type" : "type-30",
+   "self_type" : "type-46",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dynamic *",
-   "name" : "dynamic *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-120",
+   "linker_set_key" : "const elf32_phdr *",
+   "name" : "const elf32_phdr *",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
   },
@@ -973,61 +680,138 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
-  }
- ],
- "qualified_types" :
- [
+  },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-11",
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-110",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dynamic *",
+   "name" : "dynamic *",
+   "referenced_type" : "type-66",
+   "self_type" : "type-114",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
+   "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
+   "referenced_type" : "type-109",
+   "self_type" : "type-111",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int *",
+   "name" : "int *",
+   "referenced_type" : "type-1",
+   "self_type" : "type-112",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned int *",
+   "name" : "unsigned int *",
+   "referenced_type" : "type-13",
+   "self_type" : "type-45",
+   "size" : 4,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_fpregs *",
+   "name" : "user_fpregs *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-38",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_regs *",
+   "name" : "user_regs *",
+   "referenced_type" : "type-23",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const void *)",
+   "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-4",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, const void *)",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
+   "linker_set_key" : "void *",
+   "name" : "void *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-6",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, const void *)",
+   "referenced_type" : "type-121",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
+   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
    "referenced_type" : "type-12",
-   "self_type" : "type-14",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-17",
+   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
+   "name" : "void *(*)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
-  },
+  }
+ ],
+ "qualified_types" :
+ [
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android_dlextinfo",
    "name" : "const android_dlextinfo",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 40,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
@@ -1036,206 +820,270 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-53",
+   "referenced_type" : "type-36",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-9",
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-7",
-   "self_type" : "type-42",
-   "size" : 4,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const elf32_phdr",
    "name" : "const elf32_phdr",
-   "referenced_type" : "type-86",
-   "self_type" : "type-114",
+   "referenced_type" : "type-80",
+   "self_type" : "type-108",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int",
+   "name" : "const unsigned int",
+   "referenced_type" : "type-13",
+   "self_type" : "type-39",
+   "size" : 4,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const void",
+   "name" : "const void",
+   "referenced_type" : "type-5",
+   "self_type" : "type-8",
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, const void *)",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
+   "referenced_type" : "type-11",
+   "self_type" : "type-14",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "m_value",
-     "referenced_type" : "type-31"
+     "field_name" : "v",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
+     "field_name" : "padding",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
     }
    ],
-   "linker_set_key" : "Elf32_Move",
-   "name" : "Elf32_Move",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Move"
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf32_Syminfo",
-   "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Syminfo"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-45"
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vd_ndx",
+     "field_name" : "dli_fbase",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vd_hash",
+     "field_name" : "dli_sname",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "vd_aux",
+     "field_name" : "dli_saddr",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf32_Lib",
+   "name" : "Elf32_Lib",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
+   "unique_id" : "_ZTS9Elf32_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf32_Move",
+   "name" : "Elf32_Move",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf32_Syminfo",
+   "name" : "Elf32_Syminfo",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
    "alignment" : 4,
@@ -1243,18 +1091,18 @@
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf32_Verdaux",
    "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Verdaux"
@@ -1265,105 +1113,46 @@
    [
     {
      "field_name" : "vd_version",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_cnt",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vd_next",
      "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vda_next",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vn_cnt",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vn_file",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vn_aux",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vn_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1371,33 +1160,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1408,36 +1197,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-13"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-32"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1445,33 +1517,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
@@ -1481,313 +1553,112 @@
    "fields" :
    [
     {
-     "field_name" : "dlpi_addr",
-     "referenced_type" : "type-7"
+     "field_name" : "vn_version",
+     "referenced_type" : "type-42"
     },
     {
-     "field_name" : "dlpi_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dlpi_phdr",
-     "field_offset" : 64,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "dlpi_phnum",
-     "field_offset" : 96,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "dl_phdr_info",
-   "name" : "dl_phdr_info",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "dl_phdr_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_addr",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-55"
-    },
-    {
-     "field_name" : "l_ld",
-     "field_offset" : 64,
-     "referenced_type" : "type-120"
-    },
-    {
-     "field_name" : "l_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-121"
-    },
-    {
-     "field_name" : "l_prev",
-     "field_offset" : 128,
-     "referenced_type" : "type-121"
-    }
-   ],
-   "linker_set_key" : "link_map",
-   "name" : "link_map",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "link_map"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_version",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "r_map",
-     "field_offset" : 32,
-     "referenced_type" : "type-121"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "arena",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "ordblks",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "smblks",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "hblks",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "hblkhd",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "usmblks",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fsmblks",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "uordblks",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fordblks",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "keepcost",
-     "field_offset" : 288,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "mallinfo",
-   "name" : "mallinfo",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/malloc.h",
-   "unique_id" : "mallinfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "div_t",
-   "name" : "div_t",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "div_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fpregs",
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "fpsr",
-     "field_offset" : 768,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fpcr",
-     "field_offset" : 800,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "ftype",
-     "field_offset" : 832,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "init_flag",
-     "field_offset" : 896,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "user_fpregs",
-   "name" : "user_fpregs",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 116,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sign1",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "unused",
-     "field_offset" : 1,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sign2",
+     "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-42"
     },
     {
-     "field_name" : "exponent",
-     "field_offset" : 17,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "j",
-     "field_offset" : 31,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "mantissa1",
+     "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "mantissa0",
+     "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vn_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "user_fpregs::fp_reg",
-   "name" : "user_fpregs::fp_reg",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs::fp_reg"
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-89"
+    }
+   ],
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "uregs",
-     "referenced_type" : "type-27"
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-53"
     }
    ],
-   "linker_set_key" : "user_regs",
-   "name" : "user_regs",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 72,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_regs"
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-55"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
   },
   {
    "alignment" : 8,
@@ -1795,17 +1666,17 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "reserved_addr",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "reserved_size",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "relro_fd",
@@ -1830,396 +1701,65 @@
    ],
    "linker_set_key" : "android_dlextinfo",
    "name" : "android_dlextinfo",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 40,
    "source_file" : "/bionic/libc/include/android/dlext.h",
    "unique_id" : "android_dlextinfo"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "fpregs",
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "fpscr",
-     "field_offset" : 2048,
-     "referenced_type" : "type-28"
-    }
-   ],
-   "linker_set_key" : "user_vfp",
-   "name" : "user_vfp",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 264,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_vfp"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "fpexc",
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "fpinst",
-     "field_offset" : 32,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "fpinst2",
-     "field_offset" : 64,
-     "referenced_type" : "type-28"
-    }
-   ],
-   "linker_set_key" : "user_vfp_exc",
-   "name" : "user_vfp_exc",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_vfp_exc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "u_fpvalid",
-     "field_offset" : 576,
+     "field_name" : "quot",
      "referenced_type" : "type-1"
     },
     {
-     "field_name" : "u_tsize",
-     "field_offset" : 608,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_dsize",
-     "field_offset" : 640,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_ssize",
-     "field_offset" : 672,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "start_code",
-     "field_offset" : 704,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "start_stack",
-     "field_offset" : 736,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "signal",
-     "field_offset" : 768,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 800,
+     "field_name" : "rem",
+     "field_offset" : 32,
      "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "u_ar0",
-     "field_offset" : 832,
-     "referenced_type" : "type-37"
-    },
-    {
-     "field_name" : "magic",
-     "field_offset" : 864,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_comm",
-     "field_offset" : 896,
-     "referenced_type" : "type-38"
-    },
-    {
-     "field_name" : "u_debugreg",
-     "field_offset" : 1152,
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_name" : "u_fp",
-     "field_offset" : 1408,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "u_fp0",
-     "field_offset" : 2336,
-     "referenced_type" : "type-41"
     }
    ],
-   "linker_set_key" : "user",
-   "name" : "user",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 296,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 32,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 64,
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "linker_set_key" : "div_t",
+   "name" : "div_t",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "__clang_max_align_nonce2",
-     "field_offset" : 64,
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "max_align_t",
-   "name" : "max_align_t",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 16,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
-   "unique_id" : "_ZTS11max_align_t"
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "div_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "flags",
-     "referenced_type" : "type-7"
+     "field_name" : "dlpi_addr",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "stack_base",
+     "field_name" : "dlpi_name",
      "field_offset" : 32,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "stack_size",
+     "field_name" : "dlpi_phdr",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-107"
     },
     {
-     "field_name" : "guard_size",
+     "field_name" : "dlpi_phnum",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sched_policy",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "sched_priority",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
+     "referenced_type" : "type-42"
     }
    ],
-   "linker_set_key" : "pthread_attr_t",
-   "name" : "pthread_attr_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_attr_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-40"
-    }
-   ],
-   "linker_set_key" : "pthread_barrier_t",
-   "name" : "pthread_barrier_t",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS17pthread_barrier_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "pthread_cond_t",
-   "name" : "pthread_cond_t",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_cond_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "pthread_mutex_t",
-   "name" : "pthread_mutex_t",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS15pthread_mutex_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-70"
-    }
-   ],
-   "linker_set_key" : "pthread_rwlock_t",
-   "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS16pthread_rwlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "pthread_spinlock_t",
-   "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS18pthread_spinlock_t"
+   "linker_set_key" : "dl_phdr_info",
+   "name" : "dl_phdr_info",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "dl_phdr_info"
   },
   {
    "alignment" : 4,
@@ -2232,13 +1772,13 @@
     {
      "field_name" : "d_un",
      "field_offset" : 32,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "dynamic",
    "name" : "dynamic",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS7dynamic"
@@ -2253,63 +1793,179 @@
     },
     {
      "field_name" : "d_ptr",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "record_kind" : "union",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTSN7dynamicUt_E"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-32"
+     "field_name" : "e_ident",
+     "referenced_type" : "type-78"
     },
     {
-     "field_name" : "d_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-42"
     }
    ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
+   "size" : 52,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
+   "unique_id" : "_ZTS9elf32_hdr"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_val",
-     "referenced_type" : "type-31"
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-31"
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
     }
    ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 8,
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
   },
   {
    "alignment" : 4,
@@ -2317,56 +1973,34 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "elf32_rel",
    "name" : "elf32_rel",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf32_rel"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_rel",
-   "name" : "elf64_rel",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_rel"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_addend",
@@ -2376,24 +2010,311 @@
    ],
    "linker_set_key" : "elf32_rela",
    "name" : "elf32_rela",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf32_rela"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_rel",
+   "name" : "elf64_rel",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_rel"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "r_addend",
@@ -2403,53 +2324,174 @@
    ],
    "linker_set_key" : "elf64_rela",
    "name" : "elf64_rela",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 24,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_rela"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 320,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 352,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 384,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_shdr",
+   "name" : "elf64_shdr",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_shdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 48,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "st_name",
-     "referenced_type" : "type-7"
+     "field_name" : "quot",
+     "referenced_type" : "type-17"
     },
     {
-     "field_name" : "st_value",
+     "field_name" : "rem",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-17"
     }
    ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_addr",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_name",
+     "field_offset" : 32,
+     "referenced_type" : "type-47"
+    },
+    {
+     "field_name" : "l_ld",
+     "field_offset" : 64,
+     "referenced_type" : "type-114"
+    },
+    {
+     "field_name" : "l_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-115"
+    },
+    {
+     "field_name" : "l_prev",
+     "field_offset" : 128,
+     "referenced_type" : "type-115"
+    }
+   ],
+   "linker_set_key" : "link_map",
+   "name" : "link_map",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "link_map"
   },
   {
    "alignment" : 8,
@@ -2467,714 +2509,496 @@
    ],
    "linker_set_key" : "lldiv_t",
    "name" : "lldiv_t",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 16,
    "source_file" : "/bionic/libc/include/stdlib.h",
    "unique_id" : "lldiv_t"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-84"
+     "field_name" : "arena",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-84"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "p_offset",
+     "field_name" : "ordblks",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_vaddr",
+     "field_name" : "smblks",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_paddr",
+     "field_name" : "hblks",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_filesz",
+     "field_name" : "hblkhd",
      "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_memsz",
+     "field_name" : "usmblks",
      "field_offset" : 160,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_flags",
+     "field_name" : "fsmblks",
      "field_offset" : 192,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_align",
+     "field_name" : "uordblks",
      "field_offset" : 224,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_filesz",
+     "field_name" : "fordblks",
      "field_offset" : 256,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_entsize",
+     "field_name" : "keepcost",
      "field_offset" : 288,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "linker_set_key" : "mallinfo",
+   "name" : "mallinfo",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
+   "source_file" : "/bionic/libc/include/malloc.h",
+   "unique_id" : "mallinfo"
   },
   {
    "alignment" : 8,
    "fields" :
    [
     {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-7"
+     "field_name" : "__clang_max_align_nonce1",
+     "referenced_type" : "type-32"
     },
     {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_flags",
+     "field_name" : "__clang_max_align_nonce2",
      "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 256,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 320,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 352,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 384,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 448,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-57"
     }
    ],
-   "linker_set_key" : "elf64_shdr",
-   "name" : "elf64_shdr",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-7"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "linker_set_key" : "max_align_t",
+   "name" : "max_align_t",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-31"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
+   "unique_id" : "_ZTS11max_align_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-7"
+     "field_name" : "flags",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_size",
+     "field_name" : "stack_base",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "ch_addralign",
+     "field_name" : "stack_size",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "field_name" : "guard_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "ch_addralign",
+     "field_name" : "sched_policy",
      "field_offset" : 128,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "sched_priority",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
     }
    ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "linker_set_key" : "pthread_attr_t",
+   "name" : "pthread_attr_t",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_attr_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "field_name" : "__private",
+     "referenced_type" : "type-37"
     }
    ],
-   "linker_set_key" : "Elf32_Lib",
-   "name" : "Elf32_Lib",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf32_Lib"
+   "linker_set_key" : "pthread_barrier_t",
+   "name" : "pthread_barrier_t",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS17pthread_barrier_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "field_name" : "__private",
+     "referenced_type" : "type-61"
     }
    ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "linker_set_key" : "pthread_cond_t",
+   "name" : "pthread_cond_t",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_cond_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-61"
+    }
+   ],
+   "linker_set_key" : "pthread_mutex_t",
+   "name" : "pthread_mutex_t",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS15pthread_mutex_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-64"
+    }
+   ],
+   "linker_set_key" : "pthread_rwlock_t",
+   "name" : "pthread_rwlock_t",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS16pthread_rwlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-55"
+    }
+   ],
+   "linker_set_key" : "pthread_spinlock_t",
+   "name" : "pthread_spinlock_t",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS18pthread_spinlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_version",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "r_map",
+     "field_offset" : 32,
+     "referenced_type" : "type-115"
+    },
+    {
+     "field_name" : "r_brk",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "r_state",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "r_ldbase",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "u_fpvalid",
+     "field_offset" : 576,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_tsize",
+     "field_offset" : 608,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_dsize",
+     "field_offset" : 640,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_ssize",
+     "field_offset" : 672,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "start_code",
+     "field_offset" : 704,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "start_stack",
+     "field_offset" : 736,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "signal",
+     "field_offset" : 768,
+     "referenced_type" : "type-17"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 800,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_ar0",
+     "field_offset" : 832,
+     "referenced_type" : "type-34"
+    },
+    {
+     "field_name" : "magic",
+     "field_offset" : 864,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_comm",
+     "field_offset" : 896,
+     "referenced_type" : "type-35"
+    },
+    {
+     "field_name" : "u_debugreg",
+     "field_offset" : 1152,
+     "referenced_type" : "type-37"
+    },
+    {
+     "field_name" : "u_fp",
+     "field_offset" : 1408,
+     "referenced_type" : "type-18"
+    },
+    {
+     "field_name" : "u_fp0",
+     "field_offset" : 2336,
+     "referenced_type" : "type-38"
+    }
+   ],
+   "linker_set_key" : "user",
+   "name" : "user",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
+   "size" : 296,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fpregs",
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "fpsr",
+     "field_offset" : 768,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "fpcr",
+     "field_offset" : 800,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ftype",
+     "field_offset" : 832,
+     "referenced_type" : "type-21"
+    },
+    {
+     "field_name" : "init_flag",
+     "field_offset" : 896,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "user_fpregs",
+   "name" : "user_fpregs",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
+   "size" : 116,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sign1",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "unused",
+     "field_offset" : 1,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sign2",
+     "field_offset" : 16,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "exponent",
+     "field_offset" : 17,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "j",
+     "field_offset" : 31,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "mantissa1",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "mantissa0",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "user_fpregs::fp_reg",
+   "name" : "user_fpregs::fp_reg",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs::fp_reg"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "uregs",
+     "referenced_type" : "type-24"
+    }
+   ],
+   "linker_set_key" : "user_regs",
+   "name" : "user_regs",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
+   "size" : 72,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_regs"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "fpregs",
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "fpscr",
+     "field_offset" : 2048,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "user_vfp",
+   "name" : "user_vfp",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
+   "size" : 264,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_vfp"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fpexc",
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "fpinst",
+     "field_offset" : 32,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "fpinst2",
+     "field_offset" : 64,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "user_vfp_exc",
+   "name" : "user_vfp_exc",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_vfp_exc"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/Q/64/arm_armv8-a/source-based/libdl.so.lsdump b/Q/64/arm_armv8-a/source-based/libdl.so.lsdump
index bf74827..7b1ea3f 100644
--- a/Q/64/arm_armv8-a/source-based/libdl.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libdl.so.lsdump
@@ -2,101 +2,11 @@
  "array_types" :
  [
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [8]",
-   "name" : "int [8]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-40",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [1]",
-   "name" : "int [1]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [10]",
-   "name" : "int [10]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-70",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [2]",
-   "name" : "int [2]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-61",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_fpregs::fp_reg [8]",
-   "name" : "user_fpregs::fp_reg [8]",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
-   "size" : 96,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-25",
-   "self_type" : "type-84",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [8]",
-   "name" : "unsigned char [8]",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [32]",
-   "name" : "unsigned long [32]",
-   "referenced_type" : "type-28",
-   "self_type" : "type-59",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [18]",
-   "name" : "unsigned long [18]",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
-   "size" : 72,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long long [32]",
-   "name" : "unsigned long long [32]",
-   "referenced_type" : "type-31",
-   "self_type" : "type-34",
-   "size" : 256,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "char [32]",
    "name" : "char [32]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-36",
+   "self_type" : "type-35",
    "size" : 32,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -104,10 +14,100 @@
    "alignment" : 1,
    "linker_set_key" : "char [4092]",
    "name" : "char [4092]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-48",
+   "referenced_type" : "type-36",
+   "self_type" : "type-44",
    "size" : 4092,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [10]",
+   "name" : "int [10]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-64",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [1]",
+   "name" : "int [1]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-61",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [2]",
+   "name" : "int [2]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-55",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [8]",
+   "name" : "int [8]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-37",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [16]",
+   "name" : "unsigned char [16]",
+   "referenced_type" : "type-22",
+   "self_type" : "type-78",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [8]",
+   "name" : "unsigned char [8]",
+   "referenced_type" : "type-22",
+   "self_type" : "type-21",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [18]",
+   "name" : "unsigned long [18]",
+   "referenced_type" : "type-25",
+   "self_type" : "type-24",
+   "size" : 72,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [32]",
+   "name" : "unsigned long [32]",
+   "referenced_type" : "type-25",
+   "self_type" : "type-53",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long long [32]",
+   "name" : "unsigned long long [32]",
+   "referenced_type" : "type-28",
+   "self_type" : "type-27",
+   "size" : 256,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_fpregs::fp_reg [8]",
+   "name" : "user_fpregs::fp_reg [8]",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
+   "size" : 96,
+   "source_file" : "/bionic/libc/include/sys/user.h"
   }
  ],
  "builtin_types" :
@@ -116,20 +116,10 @@
    "alignment" : 1,
    "is_integral" : true,
    "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1
   },
   {
@@ -146,16 +136,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 8
   },
   {
@@ -173,8 +163,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1
   },
   {
@@ -183,8 +173,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 4
   },
   {
@@ -193,8 +183,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 4
   },
   {
@@ -203,8 +193,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 8
   },
   {
@@ -213,15 +203,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
+   "referenced_type" : "type-5",
+   "self_type" : "type-5"
   }
  ],
  "elf_functions" :
@@ -240,18 +230,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -260,26 +242,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -333,11 +295,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-45",
+   "underlying_type" : "type-42",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -350,91 +312,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-110"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "referenced_type" : "type-115",
+   "referenced_type" : "type-109",
    "return_type" : "type-1",
-   "self_type" : "type-115",
+   "self_type" : "type-109",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, const void *)",
-   "name" : "void *(unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-127",
-   "return_type" : "type-5",
-   "self_type" : "type-127",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (void *, const void *)",
    "name" : "void (void *, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-13",
-   "return_type" : "type-6",
-   "self_type" : "type-13",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
-   "name" : "void *(unsigned int, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     },
     {
      "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
-    }
-   ],
-   "referenced_type" : "type-16",
-   "return_type" : "type-5",
-   "self_type" : "type-16",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned int, const void *)",
-   "name" : "void *(void *, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-8"
     }
    ],
    "referenced_type" : "type-4",
@@ -444,21 +346,63 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
+   "linker_set_key" : "void *(unsigned int, const void *)",
+   "name" : "void *(unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-51",
+   "referenced_type" : "type-121",
    "return_type" : "type-6",
-   "self_type" : "type-51",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "self_type" : "type-121",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
+   "name" : "void *(unsigned int, unsigned int, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "referenced_type" : "type-12",
+   "return_type" : "type-6",
+   "self_type" : "type-12",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(void *, unsigned int, const void *)",
+   "name" : "void *(void *, unsigned int, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "referenced_type" : "type-124",
+   "return_type" : "type-6",
+   "self_type" : "type-124",
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "functions" :
@@ -469,16 +413,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-49",
+   "return_type" : "type-45",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "function_name" : "__cfi_shadow_size",
    "linker_set_key" : "__cfi_shadow_size",
-   "return_type" : "type-7",
+   "return_type" : "type-13",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -487,13 +431,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -502,52 +446,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-31"
-    },
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
      "referenced_type" : "type-1"
@@ -556,23 +473,8 @@
      "referenced_type" : "type-46"
     }
    ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-54"
-    }
-   ],
    "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "function_name" : "android_get_LD_LIBRARY_PATH",
@@ -580,13 +482,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-47"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-6",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl.cpp"
   },
   {
@@ -596,84 +498,15 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-6",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-117"
+     "referenced_type" : "type-111"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
    "return_type" : "type-1",
@@ -685,13 +518,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-118"
+     "referenced_type" : "type-112"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-13",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
@@ -700,10 +533,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-48"
     }
    ],
    "return_type" : "type-1",
@@ -715,7 +548,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     }
    ],
    "return_type" : "type-1",
@@ -724,7 +557,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-55",
+   "return_type" : "type-47",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -733,13 +566,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
      "referenced_type" : "type-1"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -748,13 +581,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -763,16 +596,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
@@ -782,114 +615,24 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-118",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const elf32_phdr *",
-   "name" : "const elf32_phdr *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "referenced_type" : "type-115",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, const void *)",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const void *)",
-   "name" : "void (*)(void *, const void *)",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_fpregs *",
-   "name" : "user_fpregs *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-41",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "user_regs *",
-   "name" : "user_regs *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android_dlextinfo *",
-   "name" : "const android_dlextinfo *",
-   "referenced_type" : "type-29",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android_namespace_t *",
    "name" : "android_namespace_t *",
    "referenced_type" : "type-3",
@@ -901,71 +644,35 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-55",
+   "referenced_type" : "type-36",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
-   "name" : "void *(*)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-11",
+   "linker_set_key" : "const android_dlextinfo *",
+   "name" : "const android_dlextinfo *",
+   "referenced_type" : "type-30",
+   "self_type" : "type-46",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dynamic *",
-   "name" : "dynamic *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-120",
+   "linker_set_key" : "const elf32_phdr *",
+   "name" : "const elf32_phdr *",
+   "referenced_type" : "type-108",
+   "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
   },
@@ -973,61 +680,138 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/bionic/libc/include/dlfcn.h"
-  }
- ],
- "qualified_types" :
- [
+  },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-11",
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-110",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dynamic *",
+   "name" : "dynamic *",
+   "referenced_type" : "type-66",
+   "self_type" : "type-114",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
+   "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
+   "referenced_type" : "type-109",
+   "self_type" : "type-111",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int *",
+   "name" : "int *",
+   "referenced_type" : "type-1",
+   "self_type" : "type-112",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned int *",
+   "name" : "unsigned int *",
+   "referenced_type" : "type-13",
+   "self_type" : "type-45",
+   "size" : 4,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_fpregs *",
+   "name" : "user_fpregs *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-38",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "user_regs *",
+   "name" : "user_regs *",
+   "referenced_type" : "type-23",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const void *)",
+   "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-4",
    "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, const void *)",
-   "referenced_type" : "type-126",
-   "self_type" : "type-128",
+   "linker_set_key" : "void *",
+   "name" : "void *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-6",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, const void *)",
+   "referenced_type" : "type-121",
+   "self_type" : "type-120",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
+   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
    "referenced_type" : "type-12",
-   "self_type" : "type-14",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-17",
+   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
+   "name" : "void *(*)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
-  },
+  }
+ ],
+ "qualified_types" :
+ [
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android_dlextinfo",
    "name" : "const android_dlextinfo",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 40,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
@@ -1036,206 +820,270 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-53",
+   "referenced_type" : "type-36",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-9",
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-7",
-   "self_type" : "type-42",
-   "size" : 4,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const elf32_phdr",
    "name" : "const elf32_phdr",
-   "referenced_type" : "type-86",
-   "self_type" : "type-114",
+   "referenced_type" : "type-80",
+   "self_type" : "type-108",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int",
+   "name" : "const unsigned int",
+   "referenced_type" : "type-13",
+   "self_type" : "type-39",
+   "size" : 4,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const void",
+   "name" : "const void",
+   "referenced_type" : "type-5",
+   "self_type" : "type-8",
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, const void *)",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
+   "referenced_type" : "type-11",
+   "self_type" : "type-14",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-123",
+   "self_type" : "type-125",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "m_value",
-     "referenced_type" : "type-31"
+     "field_name" : "v",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
+     "field_name" : "padding",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
     }
    ],
-   "linker_set_key" : "Elf32_Move",
-   "name" : "Elf32_Move",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Move"
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf32_Syminfo",
-   "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Syminfo"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-45"
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vd_ndx",
+     "field_name" : "dli_fbase",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vd_hash",
+     "field_name" : "dli_sname",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "vd_aux",
+     "field_name" : "dli_saddr",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf32_Lib",
+   "name" : "Elf32_Lib",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
+   "unique_id" : "_ZTS9Elf32_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf32_Move",
+   "name" : "Elf32_Move",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf32_Syminfo",
+   "name" : "Elf32_Syminfo",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
    "alignment" : 4,
@@ -1243,18 +1091,18 @@
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf32_Verdaux",
    "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Verdaux"
@@ -1265,105 +1113,46 @@
    [
     {
      "field_name" : "vd_version",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_cnt",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vd_next",
      "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vda_next",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vn_cnt",
-     "field_offset" : 16,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "vn_file",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vn_aux",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "vn_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1371,33 +1160,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1408,36 +1197,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-13"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-32"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1445,33 +1517,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
@@ -1481,313 +1553,112 @@
    "fields" :
    [
     {
-     "field_name" : "dlpi_addr",
-     "referenced_type" : "type-7"
+     "field_name" : "vn_version",
+     "referenced_type" : "type-42"
     },
     {
-     "field_name" : "dlpi_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dlpi_phdr",
-     "field_offset" : 64,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "dlpi_phnum",
-     "field_offset" : 96,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "dl_phdr_info",
-   "name" : "dl_phdr_info",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "dl_phdr_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_addr",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-55"
-    },
-    {
-     "field_name" : "l_ld",
-     "field_offset" : 64,
-     "referenced_type" : "type-120"
-    },
-    {
-     "field_name" : "l_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-121"
-    },
-    {
-     "field_name" : "l_prev",
-     "field_offset" : 128,
-     "referenced_type" : "type-121"
-    }
-   ],
-   "linker_set_key" : "link_map",
-   "name" : "link_map",
-   "referenced_type" : "type-119",
-   "self_type" : "type-119",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "link_map"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_version",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "r_map",
-     "field_offset" : 32,
-     "referenced_type" : "type-121"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-122",
-   "self_type" : "type-122",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "arena",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "ordblks",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "smblks",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "hblks",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "hblkhd",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "usmblks",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fsmblks",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "uordblks",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fordblks",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "keepcost",
-     "field_offset" : 288,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "mallinfo",
-   "name" : "mallinfo",
-   "referenced_type" : "type-125",
-   "self_type" : "type-125",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/malloc.h",
-   "unique_id" : "mallinfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "div_t",
-   "name" : "div_t",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "div_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fpregs",
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "fpsr",
-     "field_offset" : 768,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "fpcr",
-     "field_offset" : 800,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "ftype",
-     "field_offset" : 832,
-     "referenced_type" : "type-24"
-    },
-    {
-     "field_name" : "init_flag",
-     "field_offset" : 896,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "user_fpregs",
-   "name" : "user_fpregs",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 116,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sign1",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "unused",
-     "field_offset" : 1,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sign2",
+     "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-42"
     },
     {
-     "field_name" : "exponent",
-     "field_offset" : 17,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "j",
-     "field_offset" : 31,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "mantissa1",
+     "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "mantissa0",
+     "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "vn_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "user_fpregs::fp_reg",
-   "name" : "user_fpregs::fp_reg",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs::fp_reg"
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-89"
+    }
+   ],
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-28"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "uregs",
-     "referenced_type" : "type-27"
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-53"
     }
    ],
-   "linker_set_key" : "user_regs",
-   "name" : "user_regs",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 72,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_regs"
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-55"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
   },
   {
    "alignment" : 8,
@@ -1795,17 +1666,17 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "reserved_addr",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "reserved_size",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "relro_fd",
@@ -1830,396 +1701,65 @@
    ],
    "linker_set_key" : "android_dlextinfo",
    "name" : "android_dlextinfo",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 40,
    "source_file" : "/bionic/libc/include/android/dlext.h",
    "unique_id" : "android_dlextinfo"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "fpregs",
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "fpscr",
-     "field_offset" : 2048,
-     "referenced_type" : "type-28"
-    }
-   ],
-   "linker_set_key" : "user_vfp",
-   "name" : "user_vfp",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 264,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_vfp"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "fpexc",
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "fpinst",
-     "field_offset" : 32,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "fpinst2",
-     "field_offset" : 64,
-     "referenced_type" : "type-28"
-    }
-   ],
-   "linker_set_key" : "user_vfp_exc",
-   "name" : "user_vfp_exc",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_vfp_exc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "u_fpvalid",
-     "field_offset" : 576,
+     "field_name" : "quot",
      "referenced_type" : "type-1"
     },
     {
-     "field_name" : "u_tsize",
-     "field_offset" : 608,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_dsize",
-     "field_offset" : 640,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_ssize",
-     "field_offset" : 672,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "start_code",
-     "field_offset" : 704,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "start_stack",
-     "field_offset" : 736,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "signal",
-     "field_offset" : 768,
-     "referenced_type" : "type-20"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 800,
+     "field_name" : "rem",
+     "field_offset" : 32,
      "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "u_ar0",
-     "field_offset" : 832,
-     "referenced_type" : "type-37"
-    },
-    {
-     "field_name" : "magic",
-     "field_offset" : 864,
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_comm",
-     "field_offset" : 896,
-     "referenced_type" : "type-38"
-    },
-    {
-     "field_name" : "u_debugreg",
-     "field_offset" : 1152,
-     "referenced_type" : "type-40"
-    },
-    {
-     "field_name" : "u_fp",
-     "field_offset" : 1408,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "u_fp0",
-     "field_offset" : 2336,
-     "referenced_type" : "type-41"
     }
    ],
-   "linker_set_key" : "user",
-   "name" : "user",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 296,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 32,
-     "referenced_type" : "type-48"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 64,
-     "referenced_type" : "type-52"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "linker_set_key" : "div_t",
+   "name" : "div_t",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "__clang_max_align_nonce2",
-     "field_offset" : 64,
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "max_align_t",
-   "name" : "max_align_t",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 16,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
-   "unique_id" : "_ZTS11max_align_t"
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "div_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "flags",
-     "referenced_type" : "type-7"
+     "field_name" : "dlpi_addr",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "stack_base",
+     "field_name" : "dlpi_name",
      "field_offset" : 32,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-50"
     },
     {
-     "field_name" : "stack_size",
+     "field_name" : "dlpi_phdr",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-107"
     },
     {
-     "field_name" : "guard_size",
+     "field_name" : "dlpi_phnum",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sched_policy",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "sched_priority",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
+     "referenced_type" : "type-42"
     }
    ],
-   "linker_set_key" : "pthread_attr_t",
-   "name" : "pthread_attr_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_attr_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-40"
-    }
-   ],
-   "linker_set_key" : "pthread_barrier_t",
-   "name" : "pthread_barrier_t",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS17pthread_barrier_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "pthread_cond_t",
-   "name" : "pthread_cond_t",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_cond_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "pthread_mutex_t",
-   "name" : "pthread_mutex_t",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS15pthread_mutex_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-70"
-    }
-   ],
-   "linker_set_key" : "pthread_rwlock_t",
-   "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS16pthread_rwlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "pthread_spinlock_t",
-   "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS18pthread_spinlock_t"
+   "linker_set_key" : "dl_phdr_info",
+   "name" : "dl_phdr_info",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "dl_phdr_info"
   },
   {
    "alignment" : 4,
@@ -2232,13 +1772,13 @@
     {
      "field_name" : "d_un",
      "field_offset" : 32,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "dynamic",
    "name" : "dynamic",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS7dynamic"
@@ -2253,63 +1793,179 @@
     },
     {
      "field_name" : "d_ptr",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "record_kind" : "union",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTSN7dynamicUt_E"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-32"
+     "field_name" : "e_ident",
+     "referenced_type" : "type-78"
     },
     {
-     "field_name" : "d_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-42"
     }
    ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
+   "size" : 52,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
+   "unique_id" : "_ZTS9elf32_hdr"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_val",
-     "referenced_type" : "type-31"
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-31"
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
     }
    ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 8,
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
   },
   {
    "alignment" : 4,
@@ -2317,56 +1973,34 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
    "linker_set_key" : "elf32_rel",
    "name" : "elf32_rel",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf32_rel"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_rel",
-   "name" : "elf64_rel",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_rel"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
      "field_name" : "r_addend",
@@ -2376,24 +2010,311 @@
    ],
    "linker_set_key" : "elf32_rela",
    "name" : "elf32_rela",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf32_rela"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-42"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_rel",
+   "name" : "elf64_rel",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_rel"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "r_addend",
@@ -2403,53 +2324,174 @@
    ],
    "linker_set_key" : "elf64_rela",
    "name" : "elf64_rela",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 24,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_rela"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 192,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 256,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 320,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 352,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 384,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 448,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_shdr",
+   "name" : "elf64_shdr",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_shdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 48,
+     "referenced_type" : "type-42"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 64,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-28"
+    }
+   ],
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "st_name",
-     "referenced_type" : "type-7"
+     "field_name" : "quot",
+     "referenced_type" : "type-17"
     },
     {
-     "field_name" : "st_value",
+     "field_name" : "rem",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-17"
     }
    ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_addr",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "l_name",
+     "field_offset" : 32,
+     "referenced_type" : "type-47"
+    },
+    {
+     "field_name" : "l_ld",
+     "field_offset" : 64,
+     "referenced_type" : "type-114"
+    },
+    {
+     "field_name" : "l_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-115"
+    },
+    {
+     "field_name" : "l_prev",
+     "field_offset" : 128,
+     "referenced_type" : "type-115"
+    }
+   ],
+   "linker_set_key" : "link_map",
+   "name" : "link_map",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "link_map"
   },
   {
    "alignment" : 8,
@@ -2467,714 +2509,496 @@
    ],
    "linker_set_key" : "lldiv_t",
    "name" : "lldiv_t",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 16,
    "source_file" : "/bionic/libc/include/stdlib.h",
    "unique_id" : "lldiv_t"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-84"
+     "field_name" : "arena",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-84"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "p_offset",
+     "field_name" : "ordblks",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_vaddr",
+     "field_name" : "smblks",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_paddr",
+     "field_name" : "hblks",
      "field_offset" : 96,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_filesz",
+     "field_name" : "hblkhd",
      "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_memsz",
+     "field_name" : "usmblks",
      "field_offset" : 160,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_flags",
+     "field_name" : "fsmblks",
      "field_offset" : 192,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_align",
+     "field_name" : "uordblks",
      "field_offset" : 224,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_filesz",
+     "field_name" : "fordblks",
      "field_offset" : 256,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_entsize",
+     "field_name" : "keepcost",
      "field_offset" : 288,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     }
    ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "linker_set_key" : "mallinfo",
+   "name" : "mallinfo",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
+   "source_file" : "/bionic/libc/include/malloc.h",
+   "unique_id" : "mallinfo"
   },
   {
    "alignment" : 8,
    "fields" :
    [
     {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-7"
+     "field_name" : "__clang_max_align_nonce1",
+     "referenced_type" : "type-32"
     },
     {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_flags",
+     "field_name" : "__clang_max_align_nonce2",
      "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 128,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 256,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 320,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 352,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 384,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 448,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-57"
     }
    ],
-   "linker_set_key" : "elf64_shdr",
-   "name" : "elf64_shdr",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-93"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-7"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "linker_set_key" : "max_align_t",
+   "name" : "max_align_t",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-31"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
+   "unique_id" : "_ZTS11max_align_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-7"
+     "field_name" : "flags",
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_size",
+     "field_name" : "stack_base",
      "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "ch_addralign",
+     "field_name" : "stack_size",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
+     "field_name" : "guard_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
     },
     {
-     "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "ch_addralign",
+     "field_name" : "sched_policy",
      "field_offset" : 128,
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "sched_priority",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
     }
    ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "linker_set_key" : "pthread_attr_t",
+   "name" : "pthread_attr_t",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_attr_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "field_name" : "__private",
+     "referenced_type" : "type-37"
     }
    ],
-   "linker_set_key" : "Elf32_Lib",
-   "name" : "Elf32_Lib",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf32_Lib"
+   "linker_set_key" : "pthread_barrier_t",
+   "name" : "pthread_barrier_t",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS17pthread_barrier_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_name",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
+     "field_name" : "__private",
+     "referenced_type" : "type-61"
     }
    ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "linker_set_key" : "pthread_cond_t",
+   "name" : "pthread_cond_t",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_cond_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-61"
+    }
+   ],
+   "linker_set_key" : "pthread_mutex_t",
+   "name" : "pthread_mutex_t",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS15pthread_mutex_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-64"
+    }
+   ],
+   "linker_set_key" : "pthread_rwlock_t",
+   "name" : "pthread_rwlock_t",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS16pthread_rwlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-55"
+    }
+   ],
+   "linker_set_key" : "pthread_spinlock_t",
+   "name" : "pthread_spinlock_t",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS18pthread_spinlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_version",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "r_map",
+     "field_offset" : 32,
+     "referenced_type" : "type-115"
+    },
+    {
+     "field_name" : "r_brk",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "r_state",
+     "field_offset" : 96,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "r_ldbase",
+     "field_offset" : 128,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-116",
+   "self_type" : "type-116",
    "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "u_fpvalid",
+     "field_offset" : 576,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_tsize",
+     "field_offset" : 608,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_dsize",
+     "field_offset" : 640,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_ssize",
+     "field_offset" : 672,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "start_code",
+     "field_offset" : 704,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "start_stack",
+     "field_offset" : 736,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "signal",
+     "field_offset" : 768,
+     "referenced_type" : "type-17"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 800,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_ar0",
+     "field_offset" : 832,
+     "referenced_type" : "type-34"
+    },
+    {
+     "field_name" : "magic",
+     "field_offset" : 864,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_comm",
+     "field_offset" : 896,
+     "referenced_type" : "type-35"
+    },
+    {
+     "field_name" : "u_debugreg",
+     "field_offset" : 1152,
+     "referenced_type" : "type-37"
+    },
+    {
+     "field_name" : "u_fp",
+     "field_offset" : 1408,
+     "referenced_type" : "type-18"
+    },
+    {
+     "field_name" : "u_fp0",
+     "field_offset" : 2336,
+     "referenced_type" : "type-38"
+    }
+   ],
+   "linker_set_key" : "user",
+   "name" : "user",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
+   "size" : 296,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fpregs",
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "fpsr",
+     "field_offset" : 768,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "fpcr",
+     "field_offset" : 800,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "ftype",
+     "field_offset" : 832,
+     "referenced_type" : "type-21"
+    },
+    {
+     "field_name" : "init_flag",
+     "field_offset" : 896,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "user_fpregs",
+   "name" : "user_fpregs",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
+   "size" : 116,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sign1",
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "unused",
+     "field_offset" : 1,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "sign2",
+     "field_offset" : 16,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "exponent",
+     "field_offset" : 17,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "j",
+     "field_offset" : 31,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "mantissa1",
+     "field_offset" : 32,
+     "referenced_type" : "type-13"
+    },
+    {
+     "field_name" : "mantissa0",
+     "field_offset" : 64,
+     "referenced_type" : "type-13"
+    }
+   ],
+   "linker_set_key" : "user_fpregs::fp_reg",
+   "name" : "user_fpregs::fp_reg",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs::fp_reg"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "uregs",
+     "referenced_type" : "type-24"
+    }
+   ],
+   "linker_set_key" : "user_regs",
+   "name" : "user_regs",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
+   "size" : 72,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_regs"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "fpregs",
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "fpscr",
+     "field_offset" : 2048,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "user_vfp",
+   "name" : "user_vfp",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
+   "size" : 264,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_vfp"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fpexc",
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "fpinst",
+     "field_offset" : 32,
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "fpinst2",
+     "field_offset" : 64,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "user_vfp_exc",
+   "name" : "user_vfp_exc",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_vfp_exc"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/Q/64/x86/source-based/libdl.so.lsdump b/Q/64/x86/source-based/libdl.so.lsdump
index a815cd1..293c703 100644
--- a/Q/64/x86/source-based/libdl.so.lsdump
+++ b/Q/64/x86/source-based/libdl.so.lsdump
@@ -2,83 +2,11 @@
  "array_types" :
  [
   {
-   "alignment" : 4,
-   "linker_set_key" : "long [32]",
-   "name" : "long [32]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-26",
-   "size" : 128,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long [56]",
-   "name" : "long [56]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-27",
-   "size" : 224,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long [20]",
-   "name" : "long [20]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-23",
-   "size" : 80,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [8]",
-   "name" : "int [8]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-35",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [1]",
-   "name" : "int [1]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-60",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [10]",
-   "name" : "int [10]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-63",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [2]",
-   "name" : "int [2]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [32]",
-   "name" : "unsigned long [32]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-52",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "char [32]",
    "name" : "char [32]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 32,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -86,19 +14,91 @@
    "alignment" : 1,
    "linker_set_key" : "char [4092]",
    "name" : "char [4092]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-41",
+   "referenced_type" : "type-31",
+   "self_type" : "type-38",
    "size" : 4092,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "int [10]",
+   "name" : "int [10]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-57",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [1]",
+   "name" : "int [1]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [2]",
+   "name" : "int [2]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-48",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [8]",
+   "name" : "int [8]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-32",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [20]",
+   "name" : "long [20]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-20",
+   "size" : 80,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [32]",
+   "name" : "long [32]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-23",
+   "size" : 128,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [56]",
+   "name" : "long [56]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-24",
+   "size" : 224,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-75",
-   "self_type" : "type-78",
+   "referenced_type" : "type-69",
+   "self_type" : "type-72",
    "size" : 16,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [32]",
+   "name" : "unsigned long [32]",
+   "referenced_type" : "type-27",
+   "self_type" : "type-46",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
   }
  ],
  "builtin_types" :
@@ -106,20 +106,10 @@
   {
    "alignment" : 1,
    "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1
   },
   {
@@ -136,16 +126,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 8
   },
   {
@@ -153,8 +143,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -163,8 +153,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 1
   },
   {
@@ -173,8 +163,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 4
   },
   {
@@ -183,8 +173,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -193,8 +183,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 8
   },
   {
@@ -203,15 +193,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4"
+   "referenced_type" : "type-5",
+   "self_type" : "type-5"
   }
  ],
  "elf_functions" :
@@ -230,18 +220,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -250,26 +232,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -319,11 +281,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-25",
+   "underlying_type" : "type-22",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -331,57 +293,36 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
-   "name" : "void *(unsigned int, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-11"
-    },
-    {
-     "referenced_type" : "type-11"
-    },
-    {
-     "referenced_type" : "type-6"
-    }
-   ],
-   "referenced_type" : "type-10",
-   "return_type" : "type-5",
-   "self_type" : "type-10",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (dl_phdr_info *, unsigned int, void *)",
    "name" : "int (dl_phdr_info *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-104"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "referenced_type" : "type-109",
+   "referenced_type" : "type-103",
    "return_type" : "type-1",
-   "self_type" : "type-109",
+   "self_type" : "type-103",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, const void *)",
-   "name" : "void *(unsigned int, const void *)",
+   "linker_set_key" : "void (void *, const void *)",
+   "name" : "void (void *, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-7"
     }
    ],
    "referenced_type" : "type-120",
@@ -391,36 +332,36 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned int, const void *)",
-   "name" : "void *(void *, unsigned int, const void *)",
+   "linker_set_key" : "void *(unsigned int, const void *)",
+   "name" : "void *(unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-11"
-    },
-    {
      "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-123",
-   "return_type" : "type-5",
-   "self_type" : "type-123",
+   "referenced_type" : "type-114",
+   "return_type" : "type-4",
+   "self_type" : "type-114",
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const void *)",
-   "name" : "void (void *, const void *)",
+   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
+   "name" : "void *(unsigned int, unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
      "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
    "referenced_type" : "type-3",
@@ -430,21 +371,24 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
+   "linker_set_key" : "void *(void *, unsigned int, const void *)",
+   "name" : "void *(void *, unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-44",
+   "referenced_type" : "type-117",
    "return_type" : "type-4",
-   "self_type" : "type-44",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "self_type" : "type-117",
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "functions" :
@@ -455,16 +399,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-39",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "function_name" : "__cfi_shadow_size",
    "linker_set_key" : "__cfi_shadow_size",
-   "return_type" : "type-11",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -473,13 +417,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -488,77 +432,35 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-20",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     }
    ],
    "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "function_name" : "android_get_LD_LIBRARY_PATH",
@@ -566,13 +468,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-40"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl.cpp"
   },
   {
@@ -582,84 +484,15 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-20",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-43",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-43",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
    "return_type" : "type-1",
@@ -671,10 +504,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-41"
     }
    ],
    "return_type" : "type-1",
@@ -686,7 +519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
    "return_type" : "type-1",
@@ -695,7 +528,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-48",
+   "return_type" : "type-40",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -704,13 +537,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-1"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -719,13 +552,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -734,16 +567,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
@@ -753,27 +586,90 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-106",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-111",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/stdio.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_namespace_t *",
+   "name" : "android_namespace_t *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/android/dlext.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-31",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_dlextinfo *",
+   "name" : "const android_dlextinfo *",
+   "referenced_type" : "type-13",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/android/dlext.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *",
+   "name" : "const char *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const elf32_phdr *",
    "name" : "const elf32_phdr *",
-   "referenced_type" : "type-108",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const void *",
+   "name" : "const void *",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-100",
+   "self_type" : "type-104",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dynamic *",
+   "name" : "dynamic *",
+   "referenced_type" : "type-59",
    "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
@@ -782,8 +678,17 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
    "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "referenced_type" : "type-109",
-   "self_type" : "type-111",
+   "referenced_type" : "type-103",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
   },
@@ -791,71 +696,17 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-42",
+   "referenced_type" : "type-6",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "__sFILE *",
-   "name" : "__sFILE *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, const void *)",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
-   "name" : "void *(*)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android_dlextinfo *",
-   "name" : "const android_dlextinfo *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_namespace_t *",
-   "name" : "android_namespace_t *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "user_fpregs_struct *",
    "name" : "user_fpregs_struct *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-32",
+   "referenced_type" : "type-19",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -863,8 +714,8 @@
    "alignment" : 4,
    "linker_set_key" : "user_regs_struct *",
    "name" : "user_regs_struct *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-31",
+   "referenced_type" : "type-25",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -872,6 +723,33 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *, const void *)",
    "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *",
+   "name" : "void *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-4",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, const void *)",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
@@ -879,155 +757,101 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-48",
+   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
+   "name" : "void *(*)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-5",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dynamic *",
-   "name" : "dynamic *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-6",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "qualified_types" :
  [
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, const void *)",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-11",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-122",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android_dlextinfo",
    "name" : "const android_dlextinfo",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 36,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
-   "referenced_type" : "type-2",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-46",
+   "referenced_type" : "type-31",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-4",
-   "self_type" : "type-7",
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const elf32_phdr",
    "name" : "const elf32_phdr",
-   "referenced_type" : "type-80",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-102",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int",
+   "name" : "const unsigned int",
+   "referenced_type" : "type-6",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const void",
+   "name" : "const void",
+   "referenced_type" : "type-5",
+   "self_type" : "type-8",
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, const void *)",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
    "is_volatile" : true,
    "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
    "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-9",
-   "self_type" : "type-12",
+   "referenced_type" : "type-2",
+   "self_type" : "type-9",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-116",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   }
@@ -1039,47 +863,189 @@
    "fields" :
    [
     {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-25"
+     "field_name" : "v",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_ndx",
+     "field_name" : "padding",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_hash",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-38"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-37",
+   "self_type" : "type-37",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-43"
+    },
+    {
+     "field_name" : "dli_fbase",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "dli_sname",
+     "field_offset" : 64,
+     "referenced_type" : "type-43"
+    },
+    {
+     "field_name" : "dli_saddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf32_Lib",
+   "name" : "Elf32_Lib",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
+   "unique_id" : "_ZTS9Elf32_Lib"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf32_Move",
+   "name" : "Elf32_Move",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf32_Syminfo",
+   "name" : "Elf32_Syminfo",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
    "alignment" : 4,
@@ -1087,58 +1053,68 @@
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "linker_set_key" : "Elf32_Verdaux",
+   "name" : "Elf32_Verdaux",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
+   "unique_id" : "_ZTS13Elf32_Verdaux"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-25"
+     "field_name" : "vd_version",
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_cnt",
+     "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_file",
+     "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_aux",
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vn_next",
+     "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 16,
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
+   "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1146,33 +1122,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1183,36 +1159,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-81"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-6"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-62"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-15"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
+   "size" : 28,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1220,33 +1479,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
@@ -1256,168 +1515,159 @@
    "fields" :
    [
     {
-     "field_name" : "dlpi_addr",
-     "referenced_type" : "type-11"
+     "field_name" : "vn_version",
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "dlpi_name",
+     "field_name" : "vn_cnt",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "dlpi_phdr",
+     "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "dlpi_phnum",
+     "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "dl_phdr_info",
-   "name" : "dl_phdr_info",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "dl_phdr_info"
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_addr",
-     "referenced_type" : "type-11"
+     "field_name" : "a_type",
+     "referenced_type" : "type-15"
     },
     {
-     "field_name" : "l_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "l_ld",
+     "field_name" : "a_un",
      "field_offset" : 64,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "l_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-114"
-    },
-    {
-     "field_name" : "l_prev",
-     "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-83"
     }
    ],
-   "linker_set_key" : "link_map",
-   "name" : "link_map",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "link_map"
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "r_version",
+     "field_name" : "a_val",
+     "referenced_type" : "type-15"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-46"
+    }
+   ],
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "reserved_addr",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "reserved_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "relro_fd",
+     "field_offset" : 128,
      "referenced_type" : "type-1"
     },
     {
-     "field_name" : "r_map",
-     "field_offset" : 32,
-     "referenced_type" : "type-114"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "arena",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ordblks",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "smblks",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "hblks",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "hblkhd",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "usmblks",
+     "field_name" : "library_fd",
      "field_offset" : 160,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-1"
     },
     {
-     "field_name" : "fsmblks",
+     "field_name" : "library_fd_offset",
      "field_offset" : 192,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-16"
     },
     {
-     "field_name" : "uordblks",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "fordblks",
+     "field_name" : "library_namespace",
      "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "keepcost",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-17"
     }
    ],
-   "linker_set_key" : "mallinfo",
-   "name" : "mallinfo",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/malloc.h",
-   "unique_id" : "mallinfo"
+   "linker_set_key" : "android_dlextinfo",
+   "name" : "android_dlextinfo",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
+   "size" : 36,
+   "source_file" : "/bionic/libc/include/android/dlext.h",
+   "unique_id" : "android_dlextinfo"
   },
   {
    "alignment" : 4,
@@ -1435,8 +1685,8 @@
    ],
    "linker_set_key" : "div_t",
    "name" : "div_t",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/bionic/libc/include/stdlib.h",
    "unique_id" : "div_t"
@@ -1446,653 +1696,32 @@
    "fields" :
    [
     {
-     "field_name" : "quot",
-     "referenced_type" : "type-15"
+     "field_name" : "dlpi_addr",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "rem",
+     "field_name" : "dlpi_name",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-43"
     },
     {
-     "field_name" : "reserved_addr",
+     "field_name" : "dlpi_phdr",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-101"
     },
     {
-     "field_name" : "reserved_size",
+     "field_name" : "dlpi_phnum",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "relro_fd",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "library_namespace",
-     "field_offset" : 256,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android_dlextinfo",
-   "name" : "android_dlextinfo",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 36,
-   "source_file" : "/bionic/libc/include/android/dlext.h",
-   "unique_id" : "android_dlextinfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cwd",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "swd",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "twd",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fip",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fcs",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "foo",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fos",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "st_space",
-     "field_offset" : 224,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "user_fpregs_struct",
-   "name" : "user_fpregs_struct",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
-   "size" : 108,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cwd",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "swd",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "twd",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "fop",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "fip",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fcs",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "foo",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fos",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mxcsr",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "st_space",
-     "field_offset" : 256,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "xmm_space",
-     "field_offset" : 1280,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 2304,
-     "referenced_type" : "type-27"
-    }
-   ],
-   "linker_set_key" : "user_fpxregs_struct",
-   "name" : "user_fpxregs_struct",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 512,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpxregs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ebx",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "ecx",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "edx",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "esi",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "edi",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "ebp",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eax",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xds",
-     "field_offset" : 224,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xes",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xfs",
-     "field_offset" : 288,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xgs",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "orig_eax",
-     "field_offset" : 352,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eip",
-     "field_offset" : 384,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xcs",
-     "field_offset" : 416,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eflags",
-     "field_offset" : 448,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "esp",
-     "field_offset" : 480,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xss",
-     "field_offset" : 512,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "user_regs_struct",
-   "name" : "user_regs_struct",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 68,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_regs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_fpvalid",
-     "field_offset" : 544,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "i387",
-     "field_offset" : 576,
      "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "u_tsize",
-     "field_offset" : 1440,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_dsize",
-     "field_offset" : 1472,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_ssize",
-     "field_offset" : 1504,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "start_code",
-     "field_offset" : 1536,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "start_stack",
-     "field_offset" : 1568,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "signal",
-     "field_offset" : 1600,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 1632,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "u_ar0",
-     "field_offset" : 1664,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "u_fpstate",
-     "field_offset" : 1696,
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "magic",
-     "field_offset" : 1728,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_comm",
-     "field_offset" : 1760,
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "u_debugreg",
-     "field_offset" : 2016,
-     "referenced_type" : "type-35"
     }
    ],
-   "linker_set_key" : "user",
-   "name" : "user",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 284,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 32,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 64,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "linker_set_key" : "dl_phdr_info",
+   "name" : "dl_phdr_info",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-52"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "__clang_max_align_nonce2",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "max_align_t",
-   "name" : "max_align_t",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
-   "size" : 16,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
-   "unique_id" : "_ZTS11max_align_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "stack_base",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "stack_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "guard_size",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sched_policy",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "sched_priority",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "pthread_attr_t",
-   "name" : "pthread_attr_t",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_attr_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "pthread_barrier_t",
-   "name" : "pthread_barrier_t",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS17pthread_barrier_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "pthread_cond_t",
-   "name" : "pthread_cond_t",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_cond_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "pthread_mutex_t",
-   "name" : "pthread_mutex_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS15pthread_mutex_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "pthread_rwlock_t",
-   "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS16pthread_rwlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "pthread_spinlock_t",
-   "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS18pthread_spinlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "lldiv_t",
-   "name" : "lldiv_t",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "lldiv_t"
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "dl_phdr_info"
   },
   {
    "alignment" : 4,
@@ -2105,13 +1734,13 @@
     {
      "field_name" : "d_un",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "dynamic",
    "name" : "dynamic",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS7dynamic"
@@ -2126,15 +1755,15 @@
     },
     {
      "field_name" : "d_ptr",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTSN7dynamicUt_E"
@@ -2144,45 +1773,161 @@
    "fields" :
    [
     {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-19"
+     "field_name" : "e_ident",
+     "referenced_type" : "type-72"
     },
     {
-     "field_name" : "d_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-69"
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-22"
     }
    ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 16,
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 52,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
+   "unique_id" : "_ZTS9elf32_hdr"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_val",
-     "referenced_type" : "type-18"
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-18"
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
     }
    ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 8,
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
+   "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
   },
   {
    "alignment" : 4,
@@ -2190,18 +1935,18 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "elf32_rel",
    "name" : "elf32_rel",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf32_rel"
@@ -2212,18 +1957,310 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_addend",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "elf32_rela",
+   "name" : "elf32_rela",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_rela"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-69"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-69"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-72"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-15"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "elf64_rel",
    "name" : "elf64_rel",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 16,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf64_rel"
@@ -2234,50 +2271,23 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_addend",
-     "field_offset" : 64,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "elf32_rela",
-   "name" : "elf32_rela",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_rela"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_addend",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "elf64_rela",
    "name" : "elf64_rela",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 24,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_rela"
@@ -2287,473 +2297,59 @@
    "fields" :
    [
     {
-     "field_name" : "st_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 256,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "sh_name",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_type",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_flags",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_addr",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_offset",
      "field_offset" : 192,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_size",
      "field_offset" : 256,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_link",
      "field_offset" : 320,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_info",
      "field_offset" : 352,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_addralign",
      "field_offset" : 384,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_entsize",
      "field_offset" : 448,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "elf64_shdr",
    "name" : "elf64_shdr",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 64,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_shdr"
@@ -2763,456 +2359,684 @@
    "fields" :
    [
     {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-11"
+     "field_name" : "st_name",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "n_descsz",
+     "field_name" : "st_info",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-69"
     },
     {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-11"
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-69"
     },
     {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-87"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-11"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf32_Lib",
-   "name" : "Elf32_Lib",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf32_Lib"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf32_Move",
-   "name" : "Elf32_Move",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Move"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 28,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf32_Syminfo",
-   "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Syminfo"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_ndx",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_cnt",
+     "field_name" : "st_shndx",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vd_hash",
+     "field_name" : "st_value",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-15"
     },
     {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_next",
+     "field_name" : "st_size",
      "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-15"
     }
    ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-11"
+     "field_name" : "quot",
+     "referenced_type" : "type-12"
     },
     {
-     "field_name" : "vda_next",
+     "field_name" : "rem",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-12"
     }
    ],
-   "linker_set_key" : "Elf32_Verdaux",
-   "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verdaux"
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_addr",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_name",
+     "field_offset" : 32,
+     "referenced_type" : "type-40"
+    },
+    {
+     "field_name" : "l_ld",
+     "field_offset" : 64,
+     "referenced_type" : "type-107"
+    },
+    {
+     "field_name" : "l_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-108"
+    },
+    {
+     "field_name" : "l_prev",
+     "field_offset" : 128,
+     "referenced_type" : "type-108"
+    }
+   ],
+   "linker_set_key" : "link_map",
+   "name" : "link_map",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "link_map"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "quot",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "rem",
+     "field_offset" : 64,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "linker_set_key" : "lldiv_t",
+   "name" : "lldiv_t",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "lldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "arena",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ordblks",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "smblks",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "hblks",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "hblkhd",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "usmblks",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "fsmblks",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "uordblks",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "fordblks",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "keepcost",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "mallinfo",
+   "name" : "mallinfo",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/malloc.h",
+   "unique_id" : "mallinfo"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "__clang_max_align_nonce1",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "__clang_max_align_nonce2",
+     "field_offset" : 64,
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "max_align_t",
+   "name" : "max_align_t",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
+   "size" : 16,
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
+   "unique_id" : "_ZTS11max_align_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "stack_base",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "stack_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "guard_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sched_policy",
+     "field_offset" : 128,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "sched_priority",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "pthread_attr_t",
+   "name" : "pthread_attr_t",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_attr_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-32"
+    }
+   ],
+   "linker_set_key" : "pthread_barrier_t",
+   "name" : "pthread_barrier_t",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS17pthread_barrier_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "pthread_cond_t",
+   "name" : "pthread_cond_t",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_cond_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "pthread_mutex_t",
+   "name" : "pthread_mutex_t",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS15pthread_mutex_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-57"
+    }
+   ],
+   "linker_set_key" : "pthread_rwlock_t",
+   "name" : "pthread_rwlock_t",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS16pthread_rwlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "pthread_spinlock_t",
+   "name" : "pthread_spinlock_t",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS18pthread_spinlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_version",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "r_map",
+     "field_offset" : 32,
+     "referenced_type" : "type-108"
+    },
+    {
+     "field_name" : "r_brk",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_state",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_ldbase",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_fpvalid",
+     "field_offset" : 544,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "i387",
+     "field_offset" : 576,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "u_tsize",
+     "field_offset" : 1440,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_dsize",
+     "field_offset" : 1472,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_ssize",
+     "field_offset" : 1504,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "start_code",
+     "field_offset" : 1536,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "start_stack",
+     "field_offset" : 1568,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "signal",
+     "field_offset" : 1600,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 1632,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_ar0",
+     "field_offset" : 1664,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "u_fpstate",
+     "field_offset" : 1696,
+     "referenced_type" : "type-29"
+    },
+    {
+     "field_name" : "magic",
+     "field_offset" : 1728,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_comm",
+     "field_offset" : 1760,
+     "referenced_type" : "type-30"
+    },
+    {
+     "field_name" : "u_debugreg",
+     "field_offset" : 2016,
+     "referenced_type" : "type-32"
+    }
+   ],
+   "linker_set_key" : "user",
+   "name" : "user",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
+   "size" : 284,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "cwd",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "swd",
+     "field_offset" : 32,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "twd",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fip",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fcs",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "foo",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fos",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "st_space",
+     "field_offset" : 224,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "user_fpregs_struct",
+   "name" : "user_fpregs_struct",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
+   "size" : 108,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs_struct"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "cwd",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "swd",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "twd",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "fop",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "fip",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fcs",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "foo",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fos",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "mxcsr",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 224,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "st_space",
+     "field_offset" : 256,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "xmm_space",
+     "field_offset" : 1280,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "padding",
+     "field_offset" : 2304,
+     "referenced_type" : "type-24"
+    }
+   ],
+   "linker_set_key" : "user_fpxregs_struct",
+   "name" : "user_fpxregs_struct",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
+   "size" : 512,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpxregs_struct"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ebx",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "ecx",
+     "field_offset" : 32,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "edx",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "esi",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "edi",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "ebp",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eax",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xds",
+     "field_offset" : 224,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xes",
+     "field_offset" : 256,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xfs",
+     "field_offset" : 288,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xgs",
+     "field_offset" : 320,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "orig_eax",
+     "field_offset" : 352,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eip",
+     "field_offset" : 384,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xcs",
+     "field_offset" : 416,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eflags",
+     "field_offset" : 448,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "esp",
+     "field_offset" : 480,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xss",
+     "field_offset" : 512,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "user_regs_struct",
+   "name" : "user_regs_struct",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
+   "size" : 68,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_regs_struct"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/Q/64/x86_64/source-based/libdl.so.lsdump b/Q/64/x86_64/source-based/libdl.so.lsdump
index 06b2b2a..6a3f9bf 100644
--- a/Q/64/x86_64/source-based/libdl.so.lsdump
+++ b/Q/64/x86_64/source-based/libdl.so.lsdump
@@ -2,11 +2,38 @@
  "array_types" :
  [
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-30",
+   "self_type" : "type-55",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-30",
+   "self_type" : "type-29",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4088]",
+   "name" : "char [4088]",
+   "referenced_type" : "type-30",
+   "self_type" : "type-37",
+   "size" : 4088,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
    "alignment" : 4,
    "linker_set_key" : "int [10]",
    "name" : "int [10]",
    "referenced_type" : "type-1",
-   "self_type" : "type-67",
+   "self_type" : "type-61",
    "size" : 40,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h"
   },
@@ -15,7 +42,7 @@
    "linker_set_key" : "int [12]",
    "name" : "int [12]",
    "referenced_type" : "type-1",
-   "self_type" : "type-65",
+   "self_type" : "type-59",
    "size" : 48,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h"
   },
@@ -24,7 +51,7 @@
    "linker_set_key" : "int [14]",
    "name" : "int [14]",
    "referenced_type" : "type-1",
-   "self_type" : "type-70",
+   "self_type" : "type-63",
    "size" : 56,
    "source_file" : "/bionic/libc/include/bits/pthread_types.h"
   },
@@ -33,16 +60,43 @@
    "linker_set_key" : "int [2]",
    "name" : "int [2]",
    "referenced_type" : "type-1",
-   "self_type" : "type-56",
+   "self_type" : "type-50",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
   },
   {
+   "alignment" : 8,
+   "linker_set_key" : "long [4]",
+   "name" : "long [4]",
+   "referenced_type" : "type-26",
+   "self_type" : "type-57",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "unsigned char [16]",
+   "name" : "unsigned char [16]",
+   "referenced_type" : "type-77",
+   "self_type" : "type-80",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned int [24]",
+   "name" : "unsigned int [24]",
+   "referenced_type" : "type-20",
+   "self_type" : "type-23",
+   "size" : 96,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
    "alignment" : 4,
    "linker_set_key" : "unsigned int [32]",
    "name" : "unsigned int [32]",
-   "referenced_type" : "type-23",
-   "self_type" : "type-24",
+   "referenced_type" : "type-20",
+   "self_type" : "type-21",
    "size" : 128,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -50,35 +104,17 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [64]",
    "name" : "unsigned int [64]",
-   "referenced_type" : "type-23",
-   "self_type" : "type-25",
+   "referenced_type" : "type-20",
+   "self_type" : "type-22",
    "size" : 256,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [24]",
-   "name" : "unsigned int [24]",
-   "referenced_type" : "type-23",
-   "self_type" : "type-26",
-   "size" : 96,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long [4]",
-   "name" : "long [4]",
-   "referenced_type" : "type-29",
-   "self_type" : "type-63",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "unsigned long [16]",
    "name" : "unsigned long [16]",
    "referenced_type" : "type-2",
-   "self_type" : "type-54",
+   "self_type" : "type-48",
    "size" : 128,
    "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
   },
@@ -87,45 +123,9 @@
    "linker_set_key" : "unsigned long [8]",
    "name" : "unsigned long [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-34",
+   "self_type" : "type-31",
    "size" : 64,
    "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-33",
-   "self_type" : "type-61",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4088]",
-   "name" : "char [4088]",
-   "referenced_type" : "type-33",
-   "self_type" : "type-42",
-   "size" : 4088,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [16]",
-   "name" : "unsigned char [16]",
-   "referenced_type" : "type-83",
-   "self_type" : "type-86",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
   }
  ],
  "builtin_types" :
@@ -133,20 +133,10 @@
   {
    "alignment" : 1,
    "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1
   },
   {
@@ -163,16 +153,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8
   },
   {
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 16
   },
   {
@@ -180,8 +170,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 8
   },
   {
@@ -190,8 +180,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1
   },
   {
@@ -200,8 +190,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 4
   },
   {
@@ -220,8 +210,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 8
   },
   {
@@ -230,8 +220,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 2
   },
   {
@@ -257,18 +247,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -277,26 +259,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -346,11 +308,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-22",
+   "underlying_type" : "type-19",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -358,33 +320,12 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned long, const void *)",
-   "name" : "void *(void *, unsigned long, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-6"
-    }
-   ],
-   "referenced_type" : "type-11",
-   "return_type" : "type-4",
-   "self_type" : "type-11",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (dl_phdr_info *, unsigned long, void *)",
    "name" : "int (dl_phdr_info *, unsigned long, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-113"
     },
     {
      "referenced_type" : "type-2"
@@ -393,9 +334,9 @@
      "referenced_type" : "type-4"
     }
    ],
-   "referenced_type" : "type-118",
+   "referenced_type" : "type-112",
    "return_type" : "type-1",
-   "self_type" : "type-118",
+   "self_type" : "type-112",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
@@ -411,9 +352,27 @@
      "referenced_type" : "type-6"
     }
    ],
-   "referenced_type" : "type-14",
+   "referenced_type" : "type-11",
    "return_type" : "type-5",
-   "self_type" : "type-14",
+   "self_type" : "type-11",
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(unsigned long, const void *)",
+   "name" : "void *(unsigned long, const void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-6"
+    }
+   ],
+   "referenced_type" : "type-123",
+   "return_type" : "type-4",
+   "self_type" : "type-123",
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
@@ -432,18 +391,21 @@
      "referenced_type" : "type-6"
     }
    ],
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-14",
    "return_type" : "type-4",
-   "self_type" : "type-17",
+   "self_type" : "type-14",
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned long, const void *)",
-   "name" : "void *(unsigned long, const void *)",
+   "linker_set_key" : "void *(void *, unsigned long, const void *)",
+   "name" : "void *(void *, unsigned long, const void *)",
    "parameters" :
    [
     {
+     "referenced_type" : "type-4"
+    },
+    {
      "referenced_type" : "type-2"
     },
     {
@@ -454,24 +416,6 @@
    "return_type" : "type-4",
    "self_type" : "type-3",
    "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-47"
-    }
-   ],
-   "referenced_type" : "type-46",
-   "return_type" : "type-5",
-   "self_type" : "type-46",
-   "source_file" : "/bionic/libdl/libdl.cpp"
   }
  ],
  "functions" :
@@ -485,7 +429,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-40",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -528,72 +472,30 @@
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-47"
-    },
-    {
-     "referenced_type" : "type-47"
-    },
-    {
-     "referenced_type" : "type-47"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-47"
-    },
-    {
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-18",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-41"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_get_LD_LIBRARY_PATH",
    "linker_set_key" : "android_get_LD_LIBRARY_PATH",
    "parameters" :
    [
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-2"
@@ -609,81 +511,12 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-47"
-    }
-   ],
-   "return_type" : "type-18",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-47"
-    },
-    {
-     "referenced_type" : "type-47"
-    }
-   ],
-   "return_type" : "type-45",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-47"
-    }
-   ],
-   "return_type" : "type-45",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-47"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-114"
     },
     {
      "referenced_type" : "type-4"
@@ -701,7 +534,7 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-43"
     }
    ],
    "return_type" : "type-1",
@@ -722,7 +555,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-49",
+   "return_type" : "type-42",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -731,7 +564,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-1"
@@ -749,7 +582,7 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-45"
     }
    ],
    "return_type" : "type-4",
@@ -764,10 +597,10 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-45"
     }
    ],
    "return_type" : "type-4",
@@ -780,127 +613,46 @@
  [
   {
    "alignment" : 8,
-   "linker_set_key" : "void *(*)(void *, unsigned long, const void *)",
-   "name" : "void *(*)(void *, unsigned long, const void *)",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-119",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const elf64_phdr *",
-   "name" : "const elf64_phdr *",
-   "referenced_type" : "type-117",
+   "linker_set_key" : "Elf64_Dyn *",
+   "name" : "Elf64_Dyn *",
+   "referenced_type" : "type-68",
    "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned long, void *)",
-   "name" : "int (*)(dl_phdr_info *, unsigned long, void *)",
-   "referenced_type" : "type-118",
-   "self_type" : "type-120",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/bionic/libc/include/stdio.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(void *, const void *)",
-   "name" : "void (*)(void *, const void *)",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *(*)(unsigned long, unsigned long, const void *)",
-   "name" : "void *(*)(unsigned long, unsigned long, const void *)",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android_namespace_t *",
    "name" : "android_namespace_t *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-17",
+   "self_type" : "type-16",
    "size" : 8,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "unsigned long *",
-   "name" : "unsigned long *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-43",
-   "size" : 8,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "user_fpregs_struct *",
-   "name" : "user_fpregs_struct *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "user_regs_struct *",
-   "name" : "user_regs_struct *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *(*)(unsigned long, const void *)",
-   "name" : "void *(*)(unsigned long, const void *)",
-   "referenced_type" : "type-3",
-   "self_type" : "type-9",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-49",
+   "referenced_type" : "type-30",
+   "self_type" : "type-42",
    "size" : 8,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
@@ -909,45 +661,27 @@
    "linker_set_key" : "const android_dlextinfo *",
    "name" : "const android_dlextinfo *",
    "referenced_type" : "type-38",
-   "self_type" : "type-44",
+   "self_type" : "type-41",
    "size" : 8,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-46",
-   "self_type" : "type-50",
-   "size" : 8,
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "linker_set_key" : "const elf64_phdr *",
+   "name" : "const elf64_phdr *",
+   "referenced_type" : "type-111",
+   "self_type" : "type-110",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
+   "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 8,
@@ -960,78 +694,108 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "Elf64_Dyn *",
-   "name" : "Elf64_Dyn *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-122",
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-109",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(dl_phdr_info *, unsigned long, void *)",
+   "name" : "int (*)(dl_phdr_info *, unsigned long, void *)",
+   "referenced_type" : "type-112",
+   "self_type" : "type-114",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-115",
+   "self_type" : "type-117",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long *",
+   "name" : "unsigned long *",
+   "referenced_type" : "type-2",
+   "self_type" : "type-40",
+   "size" : 8,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "user_fpregs_struct *",
+   "name" : "user_fpregs_struct *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-28",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "user_regs_struct *",
+   "name" : "user_regs_struct *",
+   "referenced_type" : "type-24",
+   "self_type" : "type-27",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(void *, const void *)",
+   "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *",
+   "name" : "void *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-4",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *(*)(unsigned long, const void *)",
+   "name" : "void *(*)(unsigned long, const void *)",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *(*)(unsigned long, unsigned long, const void *)",
+   "name" : "void *(*)(unsigned long, unsigned long, const void *)",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *(*)(void *, unsigned long, const void *)",
+   "name" : "void *(*)(void *, unsigned long, const void *)",
+   "referenced_type" : "type-3",
+   "self_type" : "type-9",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "qualified_types" :
  [
   {
    "alignment" : 8,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned long, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned long, const void *)",
-   "referenced_type" : "type-10",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 8,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
-   "name" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
-   "referenced_type" : "type-16",
-   "self_type" : "type-20",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-23",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long",
-   "name" : "const unsigned long",
-   "referenced_type" : "type-2",
-   "self_type" : "type-36",
-   "size" : 8,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-33",
-   "self_type" : "type-48",
-   "size" : 1,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android_dlextinfo",
    "name" : "const android_dlextinfo",
@@ -1041,6 +805,46 @@
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const char",
+   "name" : "const char",
+   "referenced_type" : "type-30",
+   "self_type" : "type-46",
+   "size" : 1,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const elf64_phdr",
+   "name" : "const elf64_phdr",
+   "referenced_type" : "type-83",
+   "self_type" : "type-111",
+   "size" : 56,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int",
+   "name" : "const unsigned int",
+   "referenced_type" : "type-20",
+   "self_type" : "type-32",
+   "size" : 4,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned long",
+   "name" : "const unsigned long",
+   "referenced_type" : "type-2",
+   "self_type" : "type-33",
+   "size" : 8,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
@@ -1050,19 +854,39 @@
   },
   {
    "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const elf64_phdr",
-   "name" : "const elf64_phdr",
-   "referenced_type" : "type-89",
-   "self_type" : "type-117",
-   "size" : 56,
-   "source_file" : "/bionic/libc/include/link.h"
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-10",
+   "self_type" : "type-12",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 8,
    "is_volatile" : true,
    "linker_set_key" : "void *(*volatile)(unsigned long, const void *)",
    "name" : "void *(*volatile)(unsigned long, const void *)",
+   "referenced_type" : "type-122",
+   "self_type" : "type-124",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
+   "name" : "void *(*volatile)(unsigned long, unsigned long, const void *)",
+   "referenced_type" : "type-13",
+   "self_type" : "type-15",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 8,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned long, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned long, const void *)",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
    "size" : 8,
@@ -1076,32 +900,93 @@
    "fields" :
    [
     {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-23"
+     "field_name" : "v",
+     "referenced_type" : "type-2"
     },
     {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
+     "field_name" : "padding",
+     "field_offset" : 64,
+     "referenced_type" : "type-37"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-45"
+    },
+    {
+     "field_name" : "dli_fbase",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "dli_sname",
+     "field_offset" : 128,
+     "referenced_type" : "type-45"
+    },
+    {
+     "field_name" : "dli_saddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-76"
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "ch_addralign",
-     "field_offset" : 128,
-     "referenced_type" : "type-76"
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
     }
    ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
-   "size" : 24,
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
+   "size" : 12,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
+   "unique_id" : "_ZTS10Elf32_Chdr"
   },
   {
    "alignment" : 4,
@@ -1109,257 +994,114 @@
    [
     {
      "field_name" : "l_name",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "l_time_stamp",
      "field_offset" : 32,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "l_checksum",
      "field_offset" : 64,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "l_version",
      "field_offset" : 96,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "l_flags",
      "field_offset" : 128,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "Elf32_Lib",
    "name" : "Elf32_Lib",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS9Elf32_Lib"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "m_value",
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-70"
     },
     {
      "field_name" : "m_info",
      "field_offset" : 64,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "m_poffset",
      "field_offset" : 96,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "m_repeat",
      "field_offset" : 128,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "m_stride",
      "field_offset" : 144,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "Elf32_Move",
    "name" : "Elf32_Move",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
    "size" : 24,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS10Elf32_Move"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-22"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
-  },
-  {
    "alignment" : 2,
    "fields" :
    [
     {
      "field_name" : "si_boundto",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "si_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "Elf32_Syminfo",
    "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-22"
-    }
-   ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "vd_ndx",
-     "field_offset" : 32,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "vd_hash",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-107",
-   "self_type" : "type-107",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "Elf32_Verdaux",
    "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Verdaux"
@@ -1370,105 +1112,46 @@
    [
     {
      "field_name" : "vd_version",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vd_cnt",
      "field_offset" : 48,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vd_next",
      "field_offset" : 128,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "vda_next",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "vn_cnt",
-     "field_offset" : 16,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "vn_file",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "vn_aux",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "vn_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1476,33 +1159,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1513,36 +1196,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-89"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-20"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-70"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-52"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-70"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1550,102 +1516,978 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vn_version",
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "vn_cnt",
+     "field_offset" : 16,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "vn_file",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "vn_aux",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "vn_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-107",
+   "self_type" : "type-107",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-91"
+    }
+   ],
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-70"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "reserved_addr",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "reserved_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "relro_fd",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "library_fd",
+     "field_offset" : 224,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "library_fd_offset",
+     "field_offset" : 256,
+     "referenced_type" : "type-26"
+    },
+    {
+     "field_name" : "library_namespace",
+     "field_offset" : 320,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "linker_set_key" : "android_dlextinfo",
+   "name" : "android_dlextinfo",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
+   "size" : 48,
+   "source_file" : "/bionic/libc/include/android/dlext.h",
+   "unique_id" : "android_dlextinfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "quot",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "rem",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "div_t",
+   "name" : "div_t",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "div_t"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "dlpi_addr",
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-70"
     },
     {
      "field_name" : "dlpi_name",
      "field_offset" : 64,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "dlpi_phdr",
      "field_offset" : 128,
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-110"
     },
     {
      "field_name" : "dlpi_phnum",
      "field_offset" : 192,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "dl_phdr_info",
    "name" : "dl_phdr_info",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h",
    "unique_id" : "dl_phdr_info"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-67"
+    }
+   ],
+   "linker_set_key" : "dynamic",
+   "name" : "dynamic",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS7dynamic"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-20"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
+   "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
+   "size" : 4,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN7dynamicUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-80"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 52,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "elf32_rel",
+   "name" : "elf32_rel",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_rel"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "r_addend",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "elf32_rela",
+   "name" : "elf32_rela",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_rela"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-77"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-77"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-80"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-70"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-70"
+    }
+   ],
+   "linker_set_key" : "elf64_rel",
+   "name" : "elf64_rel",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_rel"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "r_addend",
+     "field_offset" : 128,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "elf64_rela",
+   "name" : "elf64_rela",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_rela"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 128,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 192,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 256,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 320,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 352,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 384,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 448,
+     "referenced_type" : "type-70"
+    }
+   ],
+   "linker_set_key" : "elf64_shdr",
+   "name" : "elf64_shdr",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_shdr"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-77"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-77"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 48,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 64,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-70"
+    }
+   ],
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "quot",
+     "referenced_type" : "type-26"
+    },
+    {
+     "field_name" : "rem",
+     "field_offset" : 64,
+     "referenced_type" : "type-26"
+    }
+   ],
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "l_addr",
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-70"
     },
     {
      "field_name" : "l_name",
      "field_offset" : 64,
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-42"
     },
     {
      "field_name" : "l_ld",
      "field_offset" : 128,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-116"
     },
     {
      "field_name" : "l_next",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-117"
     },
     {
      "field_name" : "l_prev",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-117"
     }
    ],
    "linker_set_key" : "link_map",
    "name" : "link_map",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 40,
    "source_file" : "/bionic/libc/include/link.h",
    "unique_id" : "link_map"
@@ -1655,37 +2497,22 @@
    "fields" :
    [
     {
-     "field_name" : "r_version",
-     "referenced_type" : "type-1"
+     "field_name" : "quot",
+     "referenced_type" : "type-52"
     },
     {
-     "field_name" : "r_map",
+     "field_name" : "rem",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 128,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 192,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 256,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
+   "linker_set_key" : "lldiv_t",
+   "name" : "lldiv_t",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "lldiv_t"
   },
   {
    "alignment" : 8,
@@ -1743,34 +2570,332 @@
    ],
    "linker_set_key" : "mallinfo",
    "name" : "mallinfo",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
+   "referenced_type" : "type-121",
+   "self_type" : "type-121",
    "size" : 80,
    "source_file" : "/bionic/libc/include/malloc.h",
    "unique_id" : "mallinfo"
   },
   {
+   "alignment" : 16,
+   "fields" :
+   [
+    {
+     "field_name" : "__clang_max_align_nonce1",
+     "referenced_type" : "type-52"
+    },
+    {
+     "field_name" : "__clang_max_align_nonce2",
+     "field_offset" : 128,
+     "referenced_type" : "type-53"
+    }
+   ],
+   "linker_set_key" : "max_align_t",
+   "name" : "max_align_t",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
+   "size" : 32,
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
+   "unique_id" : "_ZTS11max_align_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "stack_base",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "stack_size",
+     "field_offset" : 128,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "guard_size",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "sched_policy",
+     "field_offset" : 256,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "sched_priority",
+     "field_offset" : 288,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "__reserved",
+     "field_offset" : 320,
+     "referenced_type" : "type-55"
+    }
+   ],
+   "linker_set_key" : "pthread_attr_t",
+   "name" : "pthread_attr_t",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
+   "size" : 56,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_attr_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-57"
+    }
+   ],
+   "linker_set_key" : "pthread_barrier_t",
+   "name" : "pthread_barrier_t",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS17pthread_barrier_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-59"
+    }
+   ],
+   "linker_set_key" : "pthread_cond_t",
+   "name" : "pthread_cond_t",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
+   "size" : 48,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_cond_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-61"
+    }
+   ],
+   "linker_set_key" : "pthread_mutex_t",
+   "name" : "pthread_mutex_t",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS15pthread_mutex_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-63"
+    }
+   ],
+   "linker_set_key" : "pthread_rwlock_t",
+   "name" : "pthread_rwlock_t",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 56,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS16pthread_rwlock_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-26"
+    }
+   ],
+   "linker_set_key" : "pthread_spinlock_t",
+   "name" : "pthread_spinlock_t",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS18pthread_spinlock_t"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "r_version",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "r_map",
+     "field_offset" : 64,
+     "referenced_type" : "type-117"
+    },
+    {
+     "field_name" : "r_brk",
+     "field_offset" : 128,
+     "referenced_type" : "type-70"
+    },
+    {
+     "field_name" : "r_state",
+     "field_offset" : 192,
+     "referenced_type" : "type-20"
+    },
+    {
+     "field_name" : "r_ldbase",
+     "field_offset" : 256,
+     "referenced_type" : "type-70"
+    }
+   ],
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-118",
+   "self_type" : "type-118",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "type-24"
+    },
+    {
+     "field_name" : "u_fpvalid",
+     "field_offset" : 1728,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "pad0",
+     "field_offset" : 1760,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "i387",
+     "field_offset" : 1792,
+     "referenced_type" : "type-18"
+    },
+    {
+     "field_name" : "u_tsize",
+     "field_offset" : 5888,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "u_dsize",
+     "field_offset" : 5952,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "u_ssize",
+     "field_offset" : 6016,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "start_code",
+     "field_offset" : 6080,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "start_stack",
+     "field_offset" : 6144,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "signal",
+     "field_offset" : 6208,
+     "referenced_type" : "type-26"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 6272,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "pad1",
+     "field_offset" : 6304,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_ar0",
+     "field_offset" : 6336,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_fpstate",
+     "field_offset" : 6400,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "magic",
+     "field_offset" : 6464,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "u_comm",
+     "field_offset" : 6528,
+     "referenced_type" : "type-29"
+    },
+    {
+     "field_name" : "u_debugreg",
+     "field_offset" : 6784,
+     "referenced_type" : "type-31"
+    },
+    {
+     "field_name" : "error_code",
+     "field_offset" : 7296,
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "fault_address",
+     "field_offset" : 7360,
+     "referenced_type" : "type-2"
+    }
+   ],
+   "linker_set_key" : "user",
+   "name" : "user",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
+   "size" : 928,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "cwd",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "swd",
      "field_offset" : 16,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "ftw",
      "field_offset" : 32,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "fop",
      "field_offset" : 48,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "rip",
@@ -1785,33 +2910,33 @@
     {
      "field_name" : "mxcsr",
      "field_offset" : 192,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "mxcr_mask",
      "field_offset" : 224,
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-20"
     },
     {
      "field_name" : "st_space",
      "field_offset" : 256,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-21"
     },
     {
      "field_name" : "xmm_space",
      "field_offset" : 1280,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "padding",
      "field_offset" : 3328,
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "user_fpregs_struct",
    "name" : "user_fpregs_struct",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 512,
    "source_file" : "/bionic/libc/include/sys/user.h",
    "unique_id" : "user_fpregs_struct"
@@ -1957,1312 +3082,11 @@
    ],
    "linker_set_key" : "user_regs_struct",
    "name" : "user_regs_struct",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 216,
    "source_file" : "/bionic/libc/include/sys/user.h",
    "unique_id" : "user_regs_struct"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-27"
-    },
-    {
-     "field_name" : "u_fpvalid",
-     "field_offset" : 1728,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "pad0",
-     "field_offset" : 1760,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "i387",
-     "field_offset" : 1792,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "u_tsize",
-     "field_offset" : 5888,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "u_dsize",
-     "field_offset" : 5952,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "u_ssize",
-     "field_offset" : 6016,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "start_code",
-     "field_offset" : 6080,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "start_stack",
-     "field_offset" : 6144,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "signal",
-     "field_offset" : 6208,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 6272,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "pad1",
-     "field_offset" : 6304,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "u_ar0",
-     "field_offset" : 6336,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_fpstate",
-     "field_offset" : 6400,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "magic",
-     "field_offset" : 6464,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "u_comm",
-     "field_offset" : 6528,
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "u_debugreg",
-     "field_offset" : 6784,
-     "referenced_type" : "type-34"
-    },
-    {
-     "field_name" : "error_code",
-     "field_offset" : 7296,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "fault_address",
-     "field_offset" : 7360,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "user",
-   "name" : "user",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 928,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved_addr",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "relro_fd",
-     "field_offset" : 192,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd",
-     "field_offset" : 224,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd_offset",
-     "field_offset" : 256,
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "library_namespace",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "android_dlextinfo",
-   "name" : "android_dlextinfo",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 48,
-   "source_file" : "/bionic/libc/include/android/dlext.h",
-   "unique_id" : "android_dlextinfo"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 64,
-     "referenced_type" : "type-42"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-47"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 128,
-     "referenced_type" : "type-47"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
-   "alignment" : 16,
-   "fields" :
-   [
-    {
-     "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "__clang_max_align_nonce2",
-     "field_offset" : 128,
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "max_align_t",
-   "name" : "max_align_t",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 32,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
-   "unique_id" : "_ZTS11max_align_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "stack_base",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "stack_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "guard_size",
-     "field_offset" : 192,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "sched_policy",
-     "field_offset" : 256,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "sched_priority",
-     "field_offset" : 288,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "__reserved",
-     "field_offset" : 320,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "pthread_attr_t",
-   "name" : "pthread_attr_t",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 56,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_attr_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "pthread_barrier_t",
-   "name" : "pthread_barrier_t",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS17pthread_barrier_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "pthread_cond_t",
-   "name" : "pthread_cond_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 48,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_cond_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "pthread_mutex_t",
-   "name" : "pthread_mutex_t",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS15pthread_mutex_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 32,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "div_t",
-   "name" : "div_t",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "div_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-70"
-    }
-   ],
-   "linker_set_key" : "pthread_rwlock_t",
-   "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 56,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS16pthread_rwlock_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "pthread_spinlock_t",
-   "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS18pthread_spinlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "d_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-73"
-    }
-   ],
-   "linker_set_key" : "dynamic",
-   "name" : "dynamic",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS7dynamic"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "d_val",
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-23"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
-   "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN7dynamicUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "d_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "d_val",
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "elf32_rel",
-   "name" : "elf32_rel",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_rel"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-29"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 64,
-     "referenced_type" : "type-29"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "elf64_rel",
-   "name" : "elf64_rel",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_rel"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "r_addend",
-     "field_offset" : 64,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "elf32_rela",
-   "name" : "elf32_rela",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_rela"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "r_addend",
-     "field_offset" : 128,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "elf64_rela",
-   "name" : "elf64_rela",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_rela"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-83"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-83"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-22"
-    }
-   ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-83"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-83"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-86"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-22"
-    }
-   ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-86"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-22"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 160,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 192,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 224,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 256,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 288,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 128,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 256,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 320,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 352,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 384,
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 448,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "elf64_shdr",
-   "name" : "elf64_shdr",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-23"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-76"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-97"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-76"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 64,
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "lldiv_t",
-   "name" : "lldiv_t",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "lldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 32,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/Q/64/x86_x86_64/source-based/libdl.so.lsdump b/Q/64/x86_x86_64/source-based/libdl.so.lsdump
index a815cd1..293c703 100644
--- a/Q/64/x86_x86_64/source-based/libdl.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libdl.so.lsdump
@@ -2,83 +2,11 @@
  "array_types" :
  [
   {
-   "alignment" : 4,
-   "linker_set_key" : "long [32]",
-   "name" : "long [32]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-26",
-   "size" : 128,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long [56]",
-   "name" : "long [56]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-27",
-   "size" : 224,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long [20]",
-   "name" : "long [20]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-23",
-   "size" : 80,
-   "source_file" : "/bionic/libc/include/sys/user.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [8]",
-   "name" : "int [8]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-35",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [1]",
-   "name" : "int [1]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-60",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [10]",
-   "name" : "int [10]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-63",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [2]",
-   "name" : "int [2]",
-   "referenced_type" : "type-1",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long [32]",
-   "name" : "unsigned long [32]",
-   "referenced_type" : "type-30",
-   "self_type" : "type-52",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "char [32]",
    "name" : "char [32]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 32,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -86,19 +14,91 @@
    "alignment" : 1,
    "linker_set_key" : "char [4092]",
    "name" : "char [4092]",
-   "referenced_type" : "type-34",
-   "self_type" : "type-41",
+   "referenced_type" : "type-31",
+   "self_type" : "type-38",
    "size" : 4092,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "int [10]",
+   "name" : "int [10]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-57",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [1]",
+   "name" : "int [1]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [2]",
+   "name" : "int [2]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-48",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int [8]",
+   "name" : "int [8]",
+   "referenced_type" : "type-1",
+   "self_type" : "type-32",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [20]",
+   "name" : "long [20]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-20",
+   "size" : 80,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [32]",
+   "name" : "long [32]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-23",
+   "size" : 128,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "long [56]",
+   "name" : "long [56]",
+   "referenced_type" : "type-12",
+   "self_type" : "type-24",
+   "size" : 224,
+   "source_file" : "/bionic/libc/include/sys/user.h"
+  },
+  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-75",
-   "self_type" : "type-78",
+   "referenced_type" : "type-69",
+   "self_type" : "type-72",
    "size" : 16,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long [32]",
+   "name" : "unsigned long [32]",
+   "referenced_type" : "type-27",
+   "self_type" : "type-46",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h"
   }
  ],
  "builtin_types" :
@@ -106,20 +106,10 @@
   {
    "alignment" : 1,
    "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1
   },
   {
@@ -136,16 +126,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 8
   },
   {
@@ -153,8 +143,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -163,8 +153,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 1
   },
   {
@@ -173,8 +163,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 4
   },
   {
@@ -183,8 +173,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -193,8 +183,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 8
   },
   {
@@ -203,15 +193,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4"
+   "referenced_type" : "type-5",
+   "self_type" : "type-5"
   }
  ],
  "elf_functions" :
@@ -230,18 +220,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_create_namespace"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_dlopen_ext"
   },
   {
    "binding" : "weak",
-   "name" : "android_dlwarning"
-  },
-  {
-   "binding" : "weak",
    "name" : "android_get_LD_LIBRARY_PATH"
   },
   {
@@ -250,26 +232,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "android_get_exported_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_init_anonymous_namespace"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_link_namespaces"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_set_application_target_sdk_version"
-  },
-  {
-   "binding" : "weak",
-   "name" : "android_update_LD_LIBRARY_PATH"
-  },
-  {
-   "binding" : "weak",
    "name" : "dl_iterate_phdr"
   },
   {
@@ -319,11 +281,11 @@
    ],
    "linker_set_key" : "CFIShadow::ShadowValues",
    "name" : "CFIShadow::ShadowValues",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 2,
    "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "underlying_type" : "type-25",
+   "underlying_type" : "type-22",
    "unique_id" : "_ZTSN9CFIShadow12ShadowValuesE"
   }
  ],
@@ -331,57 +293,36 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
-   "name" : "void *(unsigned int, unsigned int, const void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-11"
-    },
-    {
-     "referenced_type" : "type-11"
-    },
-    {
-     "referenced_type" : "type-6"
-    }
-   ],
-   "referenced_type" : "type-10",
-   "return_type" : "type-5",
-   "self_type" : "type-10",
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (dl_phdr_info *, unsigned int, void *)",
    "name" : "int (dl_phdr_info *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-110"
+     "referenced_type" : "type-104"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "referenced_type" : "type-109",
+   "referenced_type" : "type-103",
    "return_type" : "type-1",
-   "self_type" : "type-109",
+   "self_type" : "type-103",
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(unsigned int, const void *)",
-   "name" : "void *(unsigned int, const void *)",
+   "linker_set_key" : "void (void *, const void *)",
+   "name" : "void (void *, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-7"
     }
    ],
    "referenced_type" : "type-120",
@@ -391,36 +332,36 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(void *, unsigned int, const void *)",
-   "name" : "void *(void *, unsigned int, const void *)",
+   "linker_set_key" : "void *(unsigned int, const void *)",
+   "name" : "void *(unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-11"
-    },
-    {
      "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-123",
-   "return_type" : "type-5",
-   "self_type" : "type-123",
+   "referenced_type" : "type-114",
+   "return_type" : "type-4",
+   "self_type" : "type-114",
    "source_file" : "/bionic/libc/include/malloc.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const void *)",
-   "name" : "void (void *, const void *)",
+   "linker_set_key" : "void *(unsigned int, unsigned int, const void *)",
+   "name" : "void *(unsigned int, unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-6"
     },
     {
      "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
    "referenced_type" : "type-3",
@@ -430,21 +371,24 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
+   "linker_set_key" : "void *(void *, unsigned int, const void *)",
+   "name" : "void *(void *, unsigned int, const void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
+    },
+    {
+     "referenced_type" : "type-7"
     }
    ],
-   "referenced_type" : "type-44",
+   "referenced_type" : "type-117",
    "return_type" : "type-4",
-   "self_type" : "type-44",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "self_type" : "type-117",
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "functions" :
@@ -455,16 +399,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-39",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "function_name" : "__cfi_shadow_size",
    "linker_set_key" : "__cfi_shadow_size",
-   "return_type" : "type-11",
+   "return_type" : "type-6",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -473,13 +417,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
@@ -488,77 +432,35 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
-   "function_name" : "android_create_namespace",
-   "linker_set_key" : "android_create_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-20"
-    }
-   ],
-   "return_type" : "type-20",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "android_dlopen_ext",
    "linker_set_key" : "android_dlopen_ext",
    "parameters" :
    [
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-5",
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "function_name" : "android_dlwarning",
-   "linker_set_key" : "android_dlwarning",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     }
    ],
    "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
+   "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
    "function_name" : "android_get_LD_LIBRARY_PATH",
@@ -566,13 +468,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-40"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "type-5",
    "source_file" : "/bionic/libdl/libdl.cpp"
   },
   {
@@ -582,84 +484,15 @@
    "source_file" : "/bionic/libc/include/android/api-level.h"
   },
   {
-   "function_name" : "android_get_exported_namespace",
-   "linker_set_key" : "android_get_exported_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-20",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_init_anonymous_namespace",
-   "linker_set_key" : "android_init_anonymous_namespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-43",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_link_namespaces",
-   "linker_set_key" : "android_link_namespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-43",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_set_application_target_sdk_version",
-   "linker_set_key" : "android_set_application_target_sdk_version",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "function_name" : "android_update_LD_LIBRARY_PATH",
-   "linker_set_key" : "android_update_LD_LIBRARY_PATH",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
    "function_name" : "dl_iterate_phdr",
    "linker_set_key" : "dl_iterate_phdr",
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
    "return_type" : "type-1",
@@ -671,10 +504,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-41"
     }
    ],
    "return_type" : "type-1",
@@ -686,7 +519,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     }
    ],
    "return_type" : "type-1",
@@ -695,7 +528,7 @@
   {
    "function_name" : "dlerror",
    "linker_set_key" : "dlerror",
-   "return_type" : "type-48",
+   "return_type" : "type-40",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -704,13 +537,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-1"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -719,13 +552,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
@@ -734,16 +567,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-43"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "type-4",
    "source_file" : "/bionic/libc/include/dlfcn.h"
   }
  ],
@@ -753,27 +586,90 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "linker_set_key" : "Dl_info *",
+   "name" : "Dl_info *",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "dl_phdr_info *",
-   "name" : "dl_phdr_info *",
-   "referenced_type" : "type-106",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-111",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
+   "source_file" : "/bionic/libc/include/stdio.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_namespace_t *",
+   "name" : "android_namespace_t *",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/android/dlext.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-31",
+   "self_type" : "type-40",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_dlextinfo *",
+   "name" : "const android_dlextinfo *",
+   "referenced_type" : "type-13",
+   "self_type" : "type-33",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/android/dlext.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *",
+   "name" : "const char *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const elf32_phdr *",
    "name" : "const elf32_phdr *",
-   "referenced_type" : "type-108",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const void *",
+   "name" : "const void *",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dl_phdr_info *",
+   "name" : "dl_phdr_info *",
+   "referenced_type" : "type-100",
+   "self_type" : "type-104",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "dynamic *",
+   "name" : "dynamic *",
+   "referenced_type" : "type-59",
    "self_type" : "type-107",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
@@ -782,8 +678,17 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(dl_phdr_info *, unsigned int, void *)",
    "name" : "int (*)(dl_phdr_info *, unsigned int, void *)",
-   "referenced_type" : "type-109",
-   "self_type" : "type-111",
+   "referenced_type" : "type-103",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/link.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "link_map *",
+   "name" : "link_map *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/bionic/libc/include/link.h"
   },
@@ -791,71 +696,17 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-42",
+   "referenced_type" : "type-6",
+   "self_type" : "type-39",
    "size" : 4,
    "source_file" : "/bionic/libdl/libdl_cfi.cpp"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "link_map *",
-   "name" : "link_map *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-114",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "__sFILE *",
-   "name" : "__sFILE *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/stdio.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(unsigned int, const void *)",
-   "name" : "void *(*)(unsigned int, const void *)",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
-   "name" : "void *(*)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android_dlextinfo *",
-   "name" : "const android_dlextinfo *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-36",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_namespace_t *",
-   "name" : "android_namespace_t *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/android/dlext.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "user_fpregs_struct *",
    "name" : "user_fpregs_struct *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-32",
+   "referenced_type" : "type-19",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -863,8 +714,8 @@
    "alignment" : 4,
    "linker_set_key" : "user_regs_struct *",
    "name" : "user_regs_struct *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-31",
+   "referenced_type" : "type-25",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/bionic/libc/include/sys/user.h"
   },
@@ -872,6 +723,33 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *, const void *)",
    "name" : "void (*)(void *, const void *)",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *",
+   "name" : "void *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-4",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, const void *)",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *(*)(unsigned int, unsigned int, const void *)",
+   "name" : "void *(*)(unsigned int, unsigned int, const void *)",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
@@ -879,155 +757,101 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-48",
+   "linker_set_key" : "void *(*)(void *, unsigned int, const void *)",
+   "name" : "void *(*)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-5",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/bionic/libdl/libdl.cpp"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "Dl_info *",
-   "name" : "Dl_info *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "dynamic *",
-   "name" : "dynamic *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/link.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-6",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/dlfcn.h"
+   "source_file" : "/bionic/libc/include/malloc.h"
   }
  ],
  "qualified_types" :
  [
   {
    "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
-   "name" : "void *(*volatile)(unsigned int, const void *)",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-11",
-   "self_type" : "type-37",
-   "size" : 4,
-   "source_file" : "/bionic/libc/private/CFIShadow.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
-   "referenced_type" : "type-122",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android_dlextinfo",
    "name" : "const android_dlextinfo",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 36,
    "source_file" : "/bionic/libc/include/android/dlext.h"
   },
   {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "void (*volatile)(void *, const void *)",
-   "name" : "void (*volatile)(void *, const void *)",
-   "referenced_type" : "type-2",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/malloc.h"
-  },
-  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-34",
-   "self_type" : "type-46",
+   "referenced_type" : "type-31",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/bionic/libc/include/dlfcn.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-4",
-   "self_type" : "type-7",
-   "source_file" : "/bionic/libc/include/dlfcn.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const elf32_phdr",
    "name" : "const elf32_phdr",
-   "referenced_type" : "type-80",
-   "self_type" : "type-108",
+   "referenced_type" : "type-74",
+   "self_type" : "type-102",
    "size" : 32,
    "source_file" : "/bionic/libc/include/link.h"
   },
   {
    "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int",
+   "name" : "const unsigned int",
+   "referenced_type" : "type-6",
+   "self_type" : "type-34",
+   "size" : 4,
+   "source_file" : "/bionic/libc/private/CFIShadow.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const void",
+   "name" : "const void",
+   "referenced_type" : "type-5",
+   "self_type" : "type-8",
+   "source_file" : "/bionic/libc/include/dlfcn.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void (*volatile)(void *, const void *)",
+   "name" : "void (*volatile)(void *, const void *)",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(unsigned int, const void *)",
+   "name" : "void *(*volatile)(unsigned int, const void *)",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
    "is_volatile" : true,
    "linker_set_key" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
    "name" : "void *(*volatile)(unsigned int, unsigned int, const void *)",
-   "referenced_type" : "type-9",
-   "self_type" : "type-12",
+   "referenced_type" : "type-2",
+   "self_type" : "type-9",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/malloc.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "name" : "void *(*volatile)(void *, unsigned int, const void *)",
+   "referenced_type" : "type-116",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/bionic/libc/include/malloc.h"
   }
@@ -1039,47 +863,189 @@
    "fields" :
    [
     {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-25"
+     "field_name" : "v",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_ndx",
+     "field_name" : "padding",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_cnt",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_hash",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_next",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-38"
     }
    ],
-   "linker_set_key" : "Elf64_Verdef",
-   "name" : "Elf64_Verdef",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "is_anonymous" : true,
+   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
+   "referenced_type" : "type-37",
+   "self_type" : "type-37",
+   "size" : 4096,
+   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
+   "unique_id" : "_ZTS3$_0"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "CFIShadow",
+   "name" : "CFIShadow",
+   "record_kind" : "class",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
+   "size" : 1,
+   "source_file" : "/bionic/libc/private/CFIShadow.h",
+   "unique_id" : "_ZTS9CFIShadow"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "dli_fname",
+     "referenced_type" : "type-43"
+    },
+    {
+     "field_name" : "dli_fbase",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "dli_sname",
+     "field_offset" : 64,
+     "referenced_type" : "type-43"
+    },
+    {
+     "field_name" : "dli_saddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "Dl_info",
+   "name" : "Dl_info",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/dlfcn.h",
+   "unique_id" : "Dl_info"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf32_Chdr",
+   "name" : "Elf32_Chdr",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
+   "size" : 12,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf32_Lib",
+   "name" : "Elf32_Lib",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_Verdef"
+   "unique_id" : "_ZTS9Elf32_Lib"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf32_Move",
+   "name" : "Elf32_Move",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf32_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf32_Syminfo",
+   "name" : "Elf32_Syminfo",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf32_Syminfo"
   },
   {
    "alignment" : 4,
@@ -1087,58 +1053,68 @@
    [
     {
      "field_name" : "vda_name",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vda_next",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf64_Verdaux",
-   "name" : "Elf64_Verdaux",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "linker_set_key" : "Elf32_Verdaux",
+   "name" : "Elf32_Verdaux",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verdaux"
+   "unique_id" : "_ZTS13Elf32_Verdaux"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vn_version",
-     "referenced_type" : "type-25"
+     "field_name" : "vd_version",
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_cnt",
+     "field_name" : "vd_flags",
      "field_offset" : 16,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_file",
+     "field_name" : "vd_ndx",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vn_aux",
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_hash",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "vn_next",
+     "field_name" : "vd_aux",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf32_Verneed",
-   "name" : "Elf32_Verneed",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 16,
+   "linker_set_key" : "Elf32_Verdef",
+   "name" : "Elf32_Verdef",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
+   "size" : 20,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verneed"
+   "unique_id" : "_ZTS12Elf32_Verdef"
   },
   {
    "alignment" : 4,
@@ -1146,33 +1122,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "Elf32_Vernaux",
    "name" : "Elf32_Vernaux",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-97",
+   "self_type" : "type-97",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf32_Vernaux"
@@ -1183,36 +1159,319 @@
    [
     {
      "field_name" : "vn_version",
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vn_cnt",
      "field_offset" : 16,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "Elf64_Verneed",
-   "name" : "Elf64_Verneed",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "linker_set_key" : "Elf32_Verneed",
+   "name" : "Elf32_Verneed",
+   "referenced_type" : "type-96",
+   "self_type" : "type-96",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Verneed"
+   "unique_id" : "_ZTS13Elf32_Verneed"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "a_un",
+     "field_offset" : 32,
+     "referenced_type" : "type-81"
+    }
+   ],
+   "linker_set_key" : "Elf32_auxv_t",
+   "name" : "Elf32_auxv_t",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf32_auxv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "a_val",
+     "referenced_type" : "type-6"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ch_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_reserved",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ch_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "ch_addralign",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    }
+   ],
+   "linker_set_key" : "Elf64_Chdr",
+   "name" : "Elf64_Chdr",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Chdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_tag",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "d_un",
+     "field_offset" : 64,
+     "referenced_type" : "type-62"
+    }
+   ],
+   "linker_set_key" : "Elf64_Dyn",
+   "name" : "Elf64_Dyn",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9Elf64_Dyn"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "d_val",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "d_ptr",
+     "referenced_type" : "type-15"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_time_stamp",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_checksum",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_version",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_flags",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Lib",
+   "name" : "Elf64_Lib",
+   "referenced_type" : "type-87",
+   "self_type" : "type-87",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS9Elf64_Lib"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "m_value",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_info",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_poffset",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "m_repeat",
+     "field_offset" : 192,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "m_stride",
+     "field_offset" : 208,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf64_Move",
+   "name" : "Elf64_Move",
+   "referenced_type" : "type-89",
+   "self_type" : "type-89",
+   "size" : 28,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS10Elf64_Move"
+  },
+  {
+   "alignment" : 2,
+   "fields" :
+   [
+    {
+     "field_name" : "si_boundto",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "si_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "Elf64_Syminfo",
+   "name" : "Elf64_Syminfo",
+   "referenced_type" : "type-91",
+   "self_type" : "type-91",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Syminfo"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vda_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vda_next",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdaux",
+   "name" : "Elf64_Verdaux",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verdaux"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "vd_version",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_flags",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_ndx",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_cnt",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vd_hash",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_aux",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "vd_next",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "Elf64_Verdef",
+   "name" : "Elf64_Verdef",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_Verdef"
   },
   {
    "alignment" : 4,
@@ -1220,33 +1479,33 @@
    [
     {
      "field_name" : "vna_hash",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_flags",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_other",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
      "field_name" : "vna_name",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "vna_next",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "Elf64_Vernaux",
    "name" : "Elf64_Vernaux",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 16,
    "source_file" : "/bionic/libc/include/elf.h",
    "unique_id" : "_ZTS13Elf64_Vernaux"
@@ -1256,168 +1515,159 @@
    "fields" :
    [
     {
-     "field_name" : "dlpi_addr",
-     "referenced_type" : "type-11"
+     "field_name" : "vn_version",
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "dlpi_name",
+     "field_name" : "vn_cnt",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "vn_file",
      "field_offset" : 32,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "dlpi_phdr",
+     "field_name" : "vn_aux",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "dlpi_phnum",
+     "field_name" : "vn_next",
      "field_offset" : 96,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-6"
     }
    ],
-   "linker_set_key" : "dl_phdr_info",
-   "name" : "dl_phdr_info",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "linker_set_key" : "Elf64_Verneed",
+   "name" : "Elf64_Verneed",
+   "referenced_type" : "type-98",
+   "self_type" : "type-98",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "dl_phdr_info"
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS13Elf64_Verneed"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "l_addr",
-     "referenced_type" : "type-11"
+     "field_name" : "a_type",
+     "referenced_type" : "type-15"
     },
     {
-     "field_name" : "l_name",
-     "field_offset" : 32,
-     "referenced_type" : "type-48"
-    },
-    {
-     "field_name" : "l_ld",
+     "field_name" : "a_un",
      "field_offset" : 64,
-     "referenced_type" : "type-113"
-    },
-    {
-     "field_name" : "l_next",
-     "field_offset" : 96,
-     "referenced_type" : "type-114"
-    },
-    {
-     "field_name" : "l_prev",
-     "field_offset" : 128,
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-83"
     }
    ],
-   "linker_set_key" : "link_map",
-   "name" : "link_map",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "link_map"
+   "linker_set_key" : "Elf64_auxv_t",
+   "name" : "Elf64_auxv_t",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTS12Elf64_auxv_t"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "r_version",
+     "field_name" : "a_val",
+     "referenced_type" : "type-15"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
+   "record_kind" : "union",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/elf.h",
+   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "fds_bits",
+     "referenced_type" : "type-46"
+    }
+   ],
+   "linker_set_key" : "__kernel_fd_set",
+   "name" : "__kernel_fd_set",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
+   "size" : 128,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fd_set"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "val",
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "__kernel_fsid_t",
+   "name" : "__kernel_fsid_t",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
+   "size" : 8,
+   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
+   "unique_id" : "_ZTS15__kernel_fsid_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "reserved_addr",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "reserved_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "relro_fd",
+     "field_offset" : 128,
      "referenced_type" : "type-1"
     },
     {
-     "field_name" : "r_map",
-     "field_offset" : 32,
-     "referenced_type" : "type-114"
-    },
-    {
-     "field_name" : "r_brk",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_state",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_ldbase",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "r_debug",
-   "name" : "r_debug",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/link.h",
-   "unique_id" : "r_debug"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "arena",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ordblks",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "smblks",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "hblks",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "hblkhd",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "usmblks",
+     "field_name" : "library_fd",
      "field_offset" : 160,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-1"
     },
     {
-     "field_name" : "fsmblks",
+     "field_name" : "library_fd_offset",
      "field_offset" : 192,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-16"
     },
     {
-     "field_name" : "uordblks",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "fordblks",
+     "field_name" : "library_namespace",
      "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "keepcost",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-17"
     }
    ],
-   "linker_set_key" : "mallinfo",
-   "name" : "mallinfo",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/malloc.h",
-   "unique_id" : "mallinfo"
+   "linker_set_key" : "android_dlextinfo",
+   "name" : "android_dlextinfo",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
+   "size" : 36,
+   "source_file" : "/bionic/libc/include/android/dlext.h",
+   "unique_id" : "android_dlextinfo"
   },
   {
    "alignment" : 4,
@@ -1435,8 +1685,8 @@
    ],
    "linker_set_key" : "div_t",
    "name" : "div_t",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/bionic/libc/include/stdlib.h",
    "unique_id" : "div_t"
@@ -1446,653 +1696,32 @@
    "fields" :
    [
     {
-     "field_name" : "quot",
-     "referenced_type" : "type-15"
+     "field_name" : "dlpi_addr",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "rem",
+     "field_name" : "dlpi_name",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "ldiv_t",
-   "name" : "ldiv_t",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "ldiv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-43"
     },
     {
-     "field_name" : "reserved_addr",
+     "field_name" : "dlpi_phdr",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "type-101"
     },
     {
-     "field_name" : "reserved_size",
+     "field_name" : "dlpi_phnum",
      "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "relro_fd",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "library_fd_offset",
-     "field_offset" : 192,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "library_namespace",
-     "field_offset" : 256,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android_dlextinfo",
-   "name" : "android_dlextinfo",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
-   "size" : 36,
-   "source_file" : "/bionic/libc/include/android/dlext.h",
-   "unique_id" : "android_dlextinfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cwd",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "swd",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "twd",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fip",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fcs",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "foo",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fos",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "st_space",
-     "field_offset" : 224,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "user_fpregs_struct",
-   "name" : "user_fpregs_struct",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
-   "size" : 108,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpregs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "cwd",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "swd",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "twd",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "fop",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "fip",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fcs",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "foo",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "fos",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mxcsr",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "st_space",
-     "field_offset" : 256,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "xmm_space",
-     "field_offset" : 1280,
-     "referenced_type" : "type-26"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 2304,
-     "referenced_type" : "type-27"
-    }
-   ],
-   "linker_set_key" : "user_fpxregs_struct",
-   "name" : "user_fpxregs_struct",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 512,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_fpxregs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ebx",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "ecx",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "edx",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "esi",
-     "field_offset" : 96,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "edi",
-     "field_offset" : 128,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "ebp",
-     "field_offset" : 160,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eax",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xds",
-     "field_offset" : 224,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xes",
-     "field_offset" : 256,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xfs",
-     "field_offset" : 288,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xgs",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "orig_eax",
-     "field_offset" : 352,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eip",
-     "field_offset" : 384,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xcs",
-     "field_offset" : 416,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "eflags",
-     "field_offset" : 448,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "esp",
-     "field_offset" : 480,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "xss",
-     "field_offset" : 512,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "user_regs_struct",
-   "name" : "user_regs_struct",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 68,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user_regs_struct"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "regs",
-     "referenced_type" : "type-28"
-    },
-    {
-     "field_name" : "u_fpvalid",
-     "field_offset" : 544,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "i387",
-     "field_offset" : 576,
      "referenced_type" : "type-22"
-    },
-    {
-     "field_name" : "u_tsize",
-     "field_offset" : 1440,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_dsize",
-     "field_offset" : 1472,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_ssize",
-     "field_offset" : 1504,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "start_code",
-     "field_offset" : 1536,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "start_stack",
-     "field_offset" : 1568,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "signal",
-     "field_offset" : 1600,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 1632,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "u_ar0",
-     "field_offset" : 1664,
-     "referenced_type" : "type-31"
-    },
-    {
-     "field_name" : "u_fpstate",
-     "field_offset" : 1696,
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "magic",
-     "field_offset" : 1728,
-     "referenced_type" : "type-30"
-    },
-    {
-     "field_name" : "u_comm",
-     "field_offset" : 1760,
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "u_debugreg",
-     "field_offset" : 2016,
-     "referenced_type" : "type-35"
     }
    ],
-   "linker_set_key" : "user",
-   "name" : "user",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 284,
-   "source_file" : "/bionic/libc/include/sys/user.h",
-   "unique_id" : "user"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "CFIShadow",
-   "name" : "CFIShadow",
-   "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 1,
-   "source_file" : "/bionic/libc/private/CFIShadow.h",
-   "unique_id" : "_ZTS9CFIShadow"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "v",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "padding",
-     "field_offset" : 32,
-     "referenced_type" : "type-41"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "name" : "(anonymous struct at /bionic/libdl/libdl_cfi.cpp:27:8) at /bionic/libdl/libdl_cfi.cpp:27:8",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 4096,
-   "source_file" : "/bionic/libdl/libdl_cfi.cpp",
-   "unique_id" : "_ZTS3$_0"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "dli_fname",
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "dli_fbase",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "dli_sname",
-     "field_offset" : 64,
-     "referenced_type" : "type-45"
-    },
-    {
-     "field_name" : "dli_saddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-5"
-    }
-   ],
-   "linker_set_key" : "Dl_info",
-   "name" : "Dl_info",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "linker_set_key" : "dl_phdr_info",
+   "name" : "dl_phdr_info",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 16,
-   "source_file" : "/bionic/libc/include/dlfcn.h",
-   "unique_id" : "Dl_info"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "fds_bits",
-     "referenced_type" : "type-52"
-    }
-   ],
-   "linker_set_key" : "__kernel_fd_set",
-   "name" : "__kernel_fd_set",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
-   "size" : 128,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fd_set"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "val",
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "__kernel_fsid_t",
-   "name" : "__kernel_fsid_t",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
-   "size" : 8,
-   "source_file" : "/bionic/libc/kernel/uapi/asm-generic/posix_types.h",
-   "unique_id" : "_ZTS15__kernel_fsid_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "__clang_max_align_nonce1",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "__clang_max_align_nonce2",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "max_align_t",
-   "name" : "max_align_t",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
-   "size" : 16,
-   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/8.0.5/include/__stddef_max_align_t.h",
-   "unique_id" : "_ZTS11max_align_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "flags",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "stack_base",
-     "field_offset" : 32,
-     "referenced_type" : "type-5"
-    },
-    {
-     "field_name" : "stack_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "guard_size",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sched_policy",
-     "field_offset" : 128,
-     "referenced_type" : "type-1"
-    },
-    {
-     "field_name" : "sched_priority",
-     "field_offset" : 160,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "pthread_attr_t",
-   "name" : "pthread_attr_t",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_attr_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "pthread_barrier_t",
-   "name" : "pthread_barrier_t",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 32,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS17pthread_barrier_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "pthread_cond_t",
-   "name" : "pthread_cond_t",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS14pthread_cond_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-60"
-    }
-   ],
-   "linker_set_key" : "pthread_mutex_t",
-   "name" : "pthread_mutex_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS15pthread_mutex_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "pthread_rwlock_t",
-   "name" : "pthread_rwlock_t",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 40,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS16pthread_rwlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "__private",
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "pthread_spinlock_t",
-   "name" : "pthread_spinlock_t",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
-   "unique_id" : "_ZTS18pthread_spinlock_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "quot",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rem",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "lldiv_t",
-   "name" : "lldiv_t",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/stdlib.h",
-   "unique_id" : "lldiv_t"
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "dl_phdr_info"
   },
   {
    "alignment" : 4,
@@ -2105,13 +1734,13 @@
     {
      "field_name" : "d_un",
      "field_offset" : 32,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "dynamic",
    "name" : "dynamic",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS7dynamic"
@@ -2126,15 +1755,15 @@
     },
     {
      "field_name" : "d_ptr",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "name" : "dynamic::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:119:3) at bionic/libc/kernel/uapi/linux/elf.h:119:3",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTSN7dynamicUt_E"
@@ -2144,45 +1773,161 @@
    "fields" :
    [
     {
-     "field_name" : "d_tag",
-     "referenced_type" : "type-19"
+     "field_name" : "e_ident",
+     "referenced_type" : "type-72"
     },
     {
-     "field_name" : "d_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-69"
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 320,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 336,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 352,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 368,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 384,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 400,
+     "referenced_type" : "type-22"
     }
    ],
-   "linker_set_key" : "Elf64_Dyn",
-   "name" : "Elf64_Dyn",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 16,
+   "linker_set_key" : "elf32_hdr",
+   "name" : "elf32_hdr",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
+   "size" : 52,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9Elf64_Dyn"
+   "unique_id" : "_ZTS9elf32_hdr"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "d_val",
-     "referenced_type" : "type-18"
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "d_ptr",
-     "referenced_type" : "type-18"
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
     }
    ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "name" : "Elf64_Dyn::(anonymous union at bionic/libc/kernel/uapi/linux/elf.h:126:3) at bionic/libc/kernel/uapi/linux/elf.h:126:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
-   "size" : 8,
+   "linker_set_key" : "elf32_note",
+   "name" : "elf32_note",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
+   "size" : 12,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTSN9Elf64_DynUt_E"
+   "unique_id" : "_ZTS10elf32_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf32_phdr",
+   "name" : "elf32_phdr",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
+   "size" : 32,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_phdr"
   },
   {
    "alignment" : 4,
@@ -2190,18 +1935,18 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     }
    ],
    "linker_set_key" : "elf32_rel",
    "name" : "elf32_rel",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf32_rel"
@@ -2212,18 +1957,310 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_info",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_addend",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "elf32_rela",
+   "name" : "elf32_rela",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_rela"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "sh_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_type",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_flags",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_addr",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_offset",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_size",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_link",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_info",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_addralign",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sh_entsize",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf32_shdr",
+   "name" : "elf32_shdr",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
+   "size" : 40,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf32_shdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "st_name",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_value",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "st_info",
+     "field_offset" : 96,
+     "referenced_type" : "type-69"
+    },
+    {
+     "field_name" : "st_other",
+     "field_offset" : 104,
+     "referenced_type" : "type-69"
+    },
+    {
+     "field_name" : "st_shndx",
+     "field_offset" : 112,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "elf32_sym",
+   "name" : "elf32_sym",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 16,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf32_sym"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "e_ident",
+     "referenced_type" : "type-72"
+    },
+    {
+     "field_name" : "e_type",
+     "field_offset" : 128,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_machine",
+     "field_offset" : 144,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_version",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_entry",
+     "field_offset" : 192,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_phoff",
+     "field_offset" : 256,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_shoff",
+     "field_offset" : 320,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "e_flags",
+     "field_offset" : 384,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "e_ehsize",
+     "field_offset" : 416,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phentsize",
+     "field_offset" : 432,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_phnum",
+     "field_offset" : 448,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shentsize",
+     "field_offset" : 464,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shnum",
+     "field_offset" : 480,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "e_shstrndx",
+     "field_offset" : 496,
+     "referenced_type" : "type-22"
+    }
+   ],
+   "linker_set_key" : "elf64_hdr",
+   "name" : "elf64_hdr",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
+   "size" : 64,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_hdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "n_namesz",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_descsz",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "n_type",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "elf64_note",
+   "name" : "elf64_note",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
+   "size" : 12,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_note"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "p_type",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_flags",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "p_offset",
+     "field_offset" : 64,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_vaddr",
+     "field_offset" : 128,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_paddr",
+     "field_offset" : 192,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_filesz",
+     "field_offset" : 256,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_memsz",
+     "field_offset" : 320,
+     "referenced_type" : "type-15"
+    },
+    {
+     "field_name" : "p_align",
+     "field_offset" : 384,
+     "referenced_type" : "type-15"
+    }
+   ],
+   "linker_set_key" : "elf64_phdr",
+   "name" : "elf64_phdr",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
+   "size" : 56,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS10elf64_phdr"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_offset",
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "elf64_rel",
    "name" : "elf64_rel",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 16,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS9elf64_rel"
@@ -2234,50 +2271,23 @@
    [
     {
      "field_name" : "r_offset",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "r_addend",
-     "field_offset" : 64,
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "elf32_rela",
-   "name" : "elf32_rela",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_rela"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "r_offset",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_info",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "r_addend",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "elf64_rela",
    "name" : "elf64_rela",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 24,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_rela"
@@ -2287,473 +2297,59 @@
    "fields" :
    [
     {
-     "field_name" : "st_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 104,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 112,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf32_sym",
-   "name" : "elf32_sym",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
-   "size" : 16,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "st_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "st_info",
-     "field_offset" : 32,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_other",
-     "field_offset" : 40,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "st_shndx",
-     "field_offset" : 48,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "st_value",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "st_size",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "elf64_sym",
-   "name" : "elf64_sym",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
-   "size" : 24,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_sym"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 320,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 336,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 352,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 368,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 384,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 400,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf32_hdr",
-   "name" : "elf32_hdr",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
-   "size" : 52,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf32_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "e_ident",
-     "referenced_type" : "type-78"
-    },
-    {
-     "field_name" : "e_type",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_machine",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_version",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_entry",
-     "field_offset" : 192,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_phoff",
-     "field_offset" : 256,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_shoff",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "e_flags",
-     "field_offset" : 384,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "e_ehsize",
-     "field_offset" : 416,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phentsize",
-     "field_offset" : 432,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_phnum",
-     "field_offset" : 448,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shentsize",
-     "field_offset" : 464,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shnum",
-     "field_offset" : 480,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "e_shstrndx",
-     "field_offset" : 496,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "elf64_hdr",
-   "name" : "elf64_hdr",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
-   "size" : 64,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS9elf64_hdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_phdr",
-   "name" : "elf32_phdr",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 32,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "p_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_flags",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "p_offset",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_vaddr",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_paddr",
-     "field_offset" : 192,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_filesz",
-     "field_offset" : 256,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_memsz",
-     "field_offset" : 320,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "p_align",
-     "field_offset" : 384,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "elf64_phdr",
-   "name" : "elf64_phdr",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
-   "size" : 56,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_phdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "sh_name",
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_type",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_flags",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_addr",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_offset",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_size",
-     "field_offset" : 160,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_link",
-     "field_offset" : 192,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_info",
-     "field_offset" : 224,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_addralign",
-     "field_offset" : 256,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_entsize",
-     "field_offset" : 288,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_shdr",
-   "name" : "elf32_shdr",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 40,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_shdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "sh_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_type",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "sh_flags",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_addr",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_offset",
      "field_offset" : 192,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_size",
      "field_offset" : 256,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_link",
      "field_offset" : 320,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_info",
      "field_offset" : 352,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-6"
     },
     {
      "field_name" : "sh_addralign",
      "field_offset" : 384,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     },
     {
      "field_name" : "sh_entsize",
      "field_offset" : 448,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "elf64_shdr",
    "name" : "elf64_shdr",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 64,
    "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
    "unique_id" : "_ZTS10elf64_shdr"
@@ -2763,456 +2359,684 @@
    "fields" :
    [
     {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-11"
+     "field_name" : "st_name",
+     "referenced_type" : "type-6"
     },
     {
-     "field_name" : "n_descsz",
+     "field_name" : "st_info",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-69"
     },
     {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf32_note",
-   "name" : "elf32_note",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf32_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "n_namesz",
-     "referenced_type" : "type-11"
+     "field_name" : "st_other",
+     "field_offset" : 40,
+     "referenced_type" : "type-69"
     },
     {
-     "field_name" : "n_descsz",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "n_type",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "elf64_note",
-   "name" : "elf64_note",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
-   "size" : 12,
-   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
-   "unique_id" : "_ZTS10elf64_note"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 32,
-     "referenced_type" : "type-87"
-    }
-   ],
-   "linker_set_key" : "Elf32_auxv_t",
-   "name" : "Elf32_auxv_t",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-11"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "name" : "Elf32_auxv_t::(anonymous union at bionic/libc/include/elf.h:49:3) at bionic/libc/include/elf.h:49:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf32_auxv_tUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_type",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "a_un",
-     "field_offset" : 64,
-     "referenced_type" : "type-89"
-    }
-   ],
-   "linker_set_key" : "Elf64_auxv_t",
-   "name" : "Elf64_auxv_t",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 16,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf64_auxv_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "a_val",
-     "referenced_type" : "type-18"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "name" : "Elf64_auxv_t::(anonymous union at bionic/libc/include/elf.h:56:3) at bionic/libc/include/elf.h:56:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTSN12Elf64_auxv_tUt_E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf32_Chdr",
-   "name" : "Elf32_Chdr",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 12,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Chdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ch_type",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "ch_size",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "ch_addralign",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "linker_set_key" : "Elf64_Chdr",
-   "name" : "Elf64_Chdr",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 24,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Chdr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf32_Lib",
-   "name" : "Elf32_Lib",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf32_Lib"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "l_name",
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_time_stamp",
-     "field_offset" : 32,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_checksum",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_version",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "l_flags",
-     "field_offset" : 128,
-     "referenced_type" : "type-11"
-    }
-   ],
-   "linker_set_key" : "Elf64_Lib",
-   "name" : "Elf64_Lib",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS9Elf64_Lib"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 144,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf32_Move",
-   "name" : "Elf32_Move",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf32_Move"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "m_value",
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_info",
-     "field_offset" : 64,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_poffset",
-     "field_offset" : 128,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "m_repeat",
-     "field_offset" : 192,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "m_stride",
-     "field_offset" : 208,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf64_Move",
-   "name" : "Elf64_Move",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 28,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS10Elf64_Move"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf32_Syminfo",
-   "name" : "Elf32_Syminfo",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Syminfo"
-  },
-  {
-   "alignment" : 2,
-   "fields" :
-   [
-    {
-     "field_name" : "si_boundto",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "si_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "Elf64_Syminfo",
-   "name" : "Elf64_Syminfo",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf64_Syminfo"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "vd_version",
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_flags",
-     "field_offset" : 16,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_ndx",
-     "field_offset" : 32,
-     "referenced_type" : "type-25"
-    },
-    {
-     "field_name" : "vd_cnt",
+     "field_name" : "st_shndx",
      "field_offset" : 48,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-22"
     },
     {
-     "field_name" : "vd_hash",
+     "field_name" : "st_value",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-15"
     },
     {
-     "field_name" : "vd_aux",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "field_name" : "vd_next",
+     "field_name" : "st_size",
      "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-15"
     }
    ],
-   "linker_set_key" : "Elf32_Verdef",
-   "name" : "Elf32_Verdef",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
-   "size" : 20,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS12Elf32_Verdef"
+   "linker_set_key" : "elf64_sym",
+   "name" : "elf64_sym",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
+   "size" : 24,
+   "source_file" : "/bionic/libc/kernel/uapi/linux/elf.h",
+   "unique_id" : "_ZTS9elf64_sym"
   },
   {
    "alignment" : 4,
    "fields" :
    [
     {
-     "field_name" : "vda_name",
-     "referenced_type" : "type-11"
+     "field_name" : "quot",
+     "referenced_type" : "type-12"
     },
     {
-     "field_name" : "vda_next",
+     "field_name" : "rem",
      "field_offset" : 32,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-12"
     }
    ],
-   "linker_set_key" : "Elf32_Verdaux",
-   "name" : "Elf32_Verdaux",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "linker_set_key" : "ldiv_t",
+   "name" : "ldiv_t",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 8,
-   "source_file" : "/bionic/libc/include/elf.h",
-   "unique_id" : "_ZTS13Elf32_Verdaux"
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "ldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "l_addr",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "l_name",
+     "field_offset" : 32,
+     "referenced_type" : "type-40"
+    },
+    {
+     "field_name" : "l_ld",
+     "field_offset" : 64,
+     "referenced_type" : "type-107"
+    },
+    {
+     "field_name" : "l_next",
+     "field_offset" : 96,
+     "referenced_type" : "type-108"
+    },
+    {
+     "field_name" : "l_prev",
+     "field_offset" : 128,
+     "referenced_type" : "type-108"
+    }
+   ],
+   "linker_set_key" : "link_map",
+   "name" : "link_map",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "link_map"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "quot",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "rem",
+     "field_offset" : 64,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "linker_set_key" : "lldiv_t",
+   "name" : "lldiv_t",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
+   "size" : 16,
+   "source_file" : "/bionic/libc/include/stdlib.h",
+   "unique_id" : "lldiv_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "arena",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "ordblks",
+     "field_offset" : 32,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "smblks",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "hblks",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "hblkhd",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "usmblks",
+     "field_offset" : 160,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "fsmblks",
+     "field_offset" : 192,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "uordblks",
+     "field_offset" : 224,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "fordblks",
+     "field_offset" : 256,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "keepcost",
+     "field_offset" : 288,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "mallinfo",
+   "name" : "mallinfo",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/malloc.h",
+   "unique_id" : "mallinfo"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "__clang_max_align_nonce1",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "__clang_max_align_nonce2",
+     "field_offset" : 64,
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "max_align_t",
+   "name" : "max_align_t",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
+   "size" : 16,
+   "source_file" : "/prebuilts/clang-tools/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h",
+   "unique_id" : "_ZTS11max_align_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "flags",
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "stack_base",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "field_name" : "stack_size",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "guard_size",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "sched_policy",
+     "field_offset" : 128,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "sched_priority",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "pthread_attr_t",
+   "name" : "pthread_attr_t",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
+   "size" : 24,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_attr_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-32"
+    }
+   ],
+   "linker_set_key" : "pthread_barrier_t",
+   "name" : "pthread_barrier_t",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
+   "size" : 32,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS17pthread_barrier_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "pthread_cond_t",
+   "name" : "pthread_cond_t",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS14pthread_cond_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "pthread_mutex_t",
+   "name" : "pthread_mutex_t",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
+   "size" : 4,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS15pthread_mutex_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-57"
+    }
+   ],
+   "linker_set_key" : "pthread_rwlock_t",
+   "name" : "pthread_rwlock_t",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
+   "size" : 40,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS16pthread_rwlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "__private",
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "pthread_spinlock_t",
+   "name" : "pthread_spinlock_t",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
+   "size" : 8,
+   "source_file" : "/bionic/libc/include/bits/pthread_types.h",
+   "unique_id" : "_ZTS18pthread_spinlock_t"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "r_version",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "r_map",
+     "field_offset" : 32,
+     "referenced_type" : "type-108"
+    },
+    {
+     "field_name" : "r_brk",
+     "field_offset" : 64,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_state",
+     "field_offset" : 96,
+     "referenced_type" : "type-6"
+    },
+    {
+     "field_name" : "r_ldbase",
+     "field_offset" : 128,
+     "referenced_type" : "type-6"
+    }
+   ],
+   "linker_set_key" : "r_debug",
+   "name" : "r_debug",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
+   "size" : 20,
+   "source_file" : "/bionic/libc/include/link.h",
+   "unique_id" : "r_debug"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "regs",
+     "referenced_type" : "type-25"
+    },
+    {
+     "field_name" : "u_fpvalid",
+     "field_offset" : 544,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "i387",
+     "field_offset" : 576,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "u_tsize",
+     "field_offset" : 1440,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_dsize",
+     "field_offset" : 1472,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_ssize",
+     "field_offset" : 1504,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "start_code",
+     "field_offset" : 1536,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "start_stack",
+     "field_offset" : 1568,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "signal",
+     "field_offset" : 1600,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 1632,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "u_ar0",
+     "field_offset" : 1664,
+     "referenced_type" : "type-28"
+    },
+    {
+     "field_name" : "u_fpstate",
+     "field_offset" : 1696,
+     "referenced_type" : "type-29"
+    },
+    {
+     "field_name" : "magic",
+     "field_offset" : 1728,
+     "referenced_type" : "type-27"
+    },
+    {
+     "field_name" : "u_comm",
+     "field_offset" : 1760,
+     "referenced_type" : "type-30"
+    },
+    {
+     "field_name" : "u_debugreg",
+     "field_offset" : 2016,
+     "referenced_type" : "type-32"
+    }
+   ],
+   "linker_set_key" : "user",
+   "name" : "user",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
+   "size" : 284,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "cwd",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "swd",
+     "field_offset" : 32,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "twd",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fip",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fcs",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "foo",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fos",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "st_space",
+     "field_offset" : 224,
+     "referenced_type" : "type-20"
+    }
+   ],
+   "linker_set_key" : "user_fpregs_struct",
+   "name" : "user_fpregs_struct",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
+   "size" : 108,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpregs_struct"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "cwd",
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "swd",
+     "field_offset" : 16,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "twd",
+     "field_offset" : 32,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "fop",
+     "field_offset" : 48,
+     "referenced_type" : "type-22"
+    },
+    {
+     "field_name" : "fip",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fcs",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "foo",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "fos",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "mxcsr",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "reserved",
+     "field_offset" : 224,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "st_space",
+     "field_offset" : 256,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "xmm_space",
+     "field_offset" : 1280,
+     "referenced_type" : "type-23"
+    },
+    {
+     "field_name" : "padding",
+     "field_offset" : 2304,
+     "referenced_type" : "type-24"
+    }
+   ],
+   "linker_set_key" : "user_fpxregs_struct",
+   "name" : "user_fpxregs_struct",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
+   "size" : 512,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_fpxregs_struct"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "ebx",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "ecx",
+     "field_offset" : 32,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "edx",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "esi",
+     "field_offset" : 96,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "edi",
+     "field_offset" : 128,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "ebp",
+     "field_offset" : 160,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eax",
+     "field_offset" : 192,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xds",
+     "field_offset" : 224,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xes",
+     "field_offset" : 256,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xfs",
+     "field_offset" : 288,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xgs",
+     "field_offset" : 320,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "orig_eax",
+     "field_offset" : 352,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eip",
+     "field_offset" : 384,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xcs",
+     "field_offset" : 416,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "eflags",
+     "field_offset" : 448,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "esp",
+     "field_offset" : 480,
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "xss",
+     "field_offset" : 512,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "user_regs_struct",
+   "name" : "user_regs_struct",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
+   "size" : 68,
+   "source_file" : "/bionic/libc/include/sys/user.h",
+   "unique_id" : "user_regs_struct"
   }
  ],
  "rvalue_reference_types" : []