diff mbox series

DWARF reader: Interpret ARM32 ELF addresses correctly

Message ID 20210309225754.2759649-1-gprocida@google.com
State Committed, archived
Headers show
Series DWARF reader: Interpret ARM32 ELF addresses correctly | expand

Commit Message

Giuliano Procida March 9, 2021, 10:57 p.m. UTC
Bug 27552 - libabigail needs to interpret ARM32 symbol addresses specially

The ARM32 ELF specification specifies that bit 0 of an ELF function
address is a flag specifying whether the instructions are Thumb or
ARM. So clear this bit before using the addresses for symbol mapping.

	* src/abg-dwarf-reader.cc
	(read_context::load_symbol_maps_from_symtab_section): Clear
	bit zero of ARM32 function addresses.
	* src/abg-elf-helpers.cc (architecture_is_arm32): Add new
	function.
	* src/abg-elf-helpers.h (architecture_is_arm32): Likewise.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Update.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 src/abg-dwarf-reader.cc                       |     3 +
 src/abg-elf-helpers.cc                        |    13 +
 src/abg-elf-helpers.h                         |     3 +
 .../test-read-dwarf/test-libandroid.so.abi    | 10851 +++++++++-------
 4 files changed, 6381 insertions(+), 4489 deletions(-)

Comments

Matthias Maennich March 10, 2021, 10:18 a.m. UTC | #1
On Tue, Mar 09, 2021 at 10:57:54PM +0000, Giuliano Procida wrote:
>Bug 27552 - libabigail needs to interpret ARM32 symbol addresses specially
>
>The ARM32 ELF specification specifies that bit 0 of an ELF function
>address is a flag specifying whether the instructions are Thumb or
>ARM. So clear this bit before using the addresses for symbol mapping.
>
>	* src/abg-dwarf-reader.cc
>	(read_context::load_symbol_maps_from_symtab_section): Clear
>	bit zero of ARM32 function addresses.
>	* src/abg-elf-helpers.cc (architecture_is_arm32): Add new
>	function.
>	* src/abg-elf-helpers.h (architecture_is_arm32): Likewise.
>	* tests/data/test-read-dwarf/test-libandroid.so.abi: Update.
>
>Signed-off-by: Giuliano Procida <gprocida@google.com>

Reviewed-by: Matthias Maennich <maennich@google.com>

Cheers,
Matthias

>---
> src/abg-dwarf-reader.cc                       |     3 +
> src/abg-elf-helpers.cc                        |    13 +
> src/abg-elf-helpers.h                         |     3 +
> .../test-read-dwarf/test-libandroid.so.abi    | 10851 +++++++++-------
> 4 files changed, 6381 insertions(+), 4489 deletions(-)
>
>diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
>index 9cfd50b3..9a8e7b34 100644
>--- a/src/abg-dwarf-reader.cc
>+++ b/src/abg-dwarf-reader.cc
>@@ -6207,6 +6207,7 @@ public:
>     ABG_ASSERT(gelf_getehdr(elf_handle(), &elf_header));
>
>     bool is_ppc64 = architecture_is_ppc64(elf_handle());
>+    bool is_arm32 = architecture_is_arm32(elf_handle());
>
>     for (size_t i = 0; i < nb_syms; ++i)
>       {
>@@ -6236,6 +6237,8 @@ public:
> 		      maybe_adjust_et_rel_sym_addr_to_abs_addr(elf_handle(),
> 							       sym);
>
>+		  if (is_arm32)
>+		    symbol_value = symbol_value & ~1;
> 		  addr_elf_symbol_sptr_map_type::const_iterator it =
> 		    fun_addr_sym_map_->find(symbol_value);
> 		  if (it == fun_addr_sym_map_->end())
>diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc
>index 5130e5b6..213c5d60 100644
>--- a/src/abg-elf-helpers.cc
>+++ b/src/abg-elf-helpers.cc
>@@ -827,6 +827,19 @@ architecture_is_ppc64(Elf* elf_handle)
>   return (elf_header && elf_header->e_machine == EM_PPC64);
> }
>
>+/// Test if the architecture of the current binary is arm32.
>+///
>+/// @param elf_handle the ELF handle to consider.
>+///
>+/// @return true iff the architecture of the current binary is arm32.
>+bool
>+architecture_is_arm32(Elf* elf_handle)
>+{
>+  GElf_Ehdr  eh_mem;
>+  GElf_Ehdr* elf_header = gelf_getehdr(elf_handle, &eh_mem);
>+  return (elf_header && elf_header->e_machine == EM_ARM);
>+}
>+
> /// Test if the endianness of the current binary is Big Endian.
> ///
> /// https://en.wikipedia.org/wiki/Endianness.
>diff --git a/src/abg-elf-helpers.h b/src/abg-elf-helpers.h
>index b4f3293d..7ce4df95 100644
>--- a/src/abg-elf-helpers.h
>+++ b/src/abg-elf-helpers.h
>@@ -130,6 +130,9 @@ get_version_for_symbol(Elf*			elf_handle,
> bool
> architecture_is_ppc64(Elf* elf_handle);
>
>+bool
>+architecture_is_arm32(Elf* elf_handle);
>+
> bool
> architecture_is_big_endian(Elf* elf_handle);
>
>diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
>index 34d22e9c..9d09d6c3 100644
>--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
>+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
>@@ -2665,7 +2665,6 @@
>     <type-decl name='void' id='48b5725f'/>
>     <type-decl name='wchar_t' size-in-bits='32' id='c523b9f1'/>
>     <typedef-decl name='size_t' type-id='f0981eeb' filepath='prebuilts/clang/host/linux-x86/clang-r383902b/lib64/clang/11.0.2/include/stddef.h' line='46' column='1' id='b59d7dce'/>
>-    <class-decl name='_jobject' size-in-bits='8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='46' column='1' id='baffb083'/>
>     <typedef-decl name='lldiv_t' type-id='8aac8194' filepath='bionic/libc/include/stdlib.h' line='146' column='1' id='f5fa3b34'/>
>     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='f5fa3b34' visibility='default' filepath='bionic/libc/include/stdlib.h' line='143' column='1' id='8aac8194'>
>       <data-member access='public' layout-offset-in-bits='0'>
>@@ -2684,12 +2683,12 @@
>         <var-decl name='rem' type-id='bd54fe1a' visibility='default' filepath='bionic/libc/include/stdlib.h' line='138' column='1'/>
>       </data-member>
>     </class-decl>
>+    <typedef-decl name='FILE' type-id='8d7b2c1e' filepath='bionic/libc/include/stdio.h' line='59' column='1' id='aa12d1ba'/>
>     <class-decl name='_JNIEnv' size-in-bits='32' is-struct='yes' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='489' column='1' id='c9459134'>
>       <data-member access='public' layout-offset-in-bits='0'>
>         <var-decl name='functions' type-id='e48f1427' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='491' column='1'/>
>       </data-member>
>     </class-decl>
>-    <typedef-decl name='FILE' type-id='8d7b2c1e' filepath='bionic/libc/include/stdio.h' line='59' column='1' id='aa12d1ba'/>
>     <typedef-decl name='va_list' type-id='7f896fb4' filepath='prebuilts/clang/host/linux-x86/clang-r383902b/lib64/clang/11.0.2/include/stdarg.h' line='14' column='1' id='2aee9912'/>
>     <typedef-decl name='fpos_t' type-id='ad707ada' filepath='bionic/libc/include/stdio.h' line='55' column='1' id='e322b6ef'/>
>     <typedef-decl name='off_t' type-id='8dda407a' filepath='bionic/libc/include/sys/types.h' line='105' column='1' id='ad707ada'/>
>@@ -3451,12 +3450,14 @@
>     <typedef-decl name='JNIEnv' type-id='c9459134' filepath='libnativehelper/include_jni/jni.h' line='139' column='1' id='d357872a'/>
>     <typedef-decl name='jclass' type-id='a5a1fc5a' filepath='libnativehelper/include_jni/jni.h' line='62' column='1' id='70de5c42'/>
>     <typedef-decl name='jobject' type-id='478e3663' filepath='libnativehelper/include_jni/jni.h' line='61' column='1' id='96f3d089'/>
>+    <class-decl name='_jobject' size-in-bits='8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='46' column='1' id='baffb083'/>
>     <typedef-decl name='jbyte' type-id='ee31ee44' filepath='libnativehelper/include_jni/jni.h' line='31' column='1' id='adf18958'/>
>     <typedef-decl name='int8_t' type-id='2171a512' filepath='bionic/libc/include/stdint.h' line='58' column='1' id='ee31ee44'/>
>     <typedef-decl name='__int8_t' type-id='28577a57' filepath='bionic/libc/include/stdint.h' line='36' column='1' id='2171a512'/>
>     <typedef-decl name='jsize' type-id='0b9c02cb' filepath='libnativehelper/include_jni/jni.h' line='40' column='1' id='2c2f1adb'/>
>     <typedef-decl name='jmethodID' type-id='b09bab5e' filepath='libnativehelper/include_jni/jni.h' line='105' column='1' id='38565182'/>
>     <typedef-decl name='jfieldID' type-id='ee3187c5' filepath='libnativehelper/include_jni/jni.h' line='102' column='1' id='1f3810cb'/>
>+    <class-decl name='AAssetManager' size-in-bits='8' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager.h' line='36' column='1' id='7907d453'/>
>     <typedef-decl name='jboolean' type-id='b96825af' filepath='libnativehelper/include_jni/jni.h' line='30' column='1' id='cc6e09ca'/>
>     <typedef-decl name='uint8_t' type-id='c51d6389' filepath='bionic/libc/include/stdint.h' line='59' column='1' id='b96825af'/>
>     <typedef-decl name='__uint8_t' type-id='002ac4a6' filepath='bionic/libc/include/stdint.h' line='37' column='1' id='c51d6389'/>
>@@ -3498,6 +3499,7 @@
>       <enumerator name='JNIGlobalRefType' value='2'/>
>       <enumerator name='JNIWeakGlobalRefType' value='3'/>
>     </enum-decl>
>+    <typedef-decl name='AAssetManager' type-id='7907d453' filepath='frameworks/native/include/android/asset_manager.h' line='54' column='1' id='f41387f0'/>
>     <typedef-decl name='pthread_mutex_t' type-id='cc3d65c7' filepath='bionic/libc/include/bits/pthread_types.h' line='78' column='1' id='7a6844eb'/>
>     <class-decl name='__anonymous_struct__4' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='7a6844eb' visibility='default' filepath='bionic/libc/include/bits/pthread_types.h' line='72' column='1' id='cc3d65c7'>
>       <data-member access='public' layout-offset-in-bits='0'>
>@@ -3523,6 +3525,7 @@
>         </function-decl>
>       </member-function>
>     </class-decl>
>+    <typedef-decl name='AAsset' type-id='1fc4034c' filepath='frameworks/native/include/android/asset_manager.h' line='73' column='1' id='d27ea7e1'/>
>     <class-decl name='AAssetDir' size-in-bits='96' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/asset_manager.cpp' line='39' column='1' id='ea9788c3'>
>       <data-member access='public' layout-offset-in-bits='0'>
>         <var-decl name='mAssetDir' type-id='6a6c3f8a' visibility='default' filepath='frameworks/base/native/android/asset_manager.cpp' line='40' column='1'/>
>@@ -3541,8 +3544,13 @@
>         </function-decl>
>       </member-function>
>     </class-decl>
>+    <typedef-decl name='AAssetDir' type-id='ea9788c3' filepath='frameworks/native/include/android/asset_manager.h' line='64' column='1' id='e6c9fab0'/>
>+    <typedef-decl name='off64_t' type-id='69bf7bee' filepath='bionic/libc/include/sys/types.h' line='107' column='1' id='05d4c620'/>
>+    <typedef-decl name='loff_t' type-id='537a730e' filepath='bionic/libc/include/sys/types.h' line='106' column='1' id='69bf7bee'/>
>+    <typedef-decl name='__kernel_loff_t' type-id='1eb56b1e' filepath='bionic/libc/kernel/uapi/asm-generic/posix_types.h' line='76' column='1' id='537a730e'/>
>     <pointer-type-def type-id='1fc4034c' size-in-bits='32' id='57d98aaa'/>
>     <pointer-type-def type-id='ea9788c3' size-in-bits='32' id='1cdc10c3'/>
>+    <pointer-type-def type-id='f41387f0' size-in-bits='32' id='081c2b23'/>
>     <pointer-type-def type-id='aa12d1ba' size-in-bits='32' id='822cd80b'/>
>     <pointer-type-def type-id='d357872a' size-in-bits='32' id='fae49a1f'/>
>     <pointer-type-def type-id='ebc81181' size-in-bits='32' id='c3a70532'/>
>@@ -4598,6 +4606,8 @@
>     <pointer-type-def type-id='da4ac88c' size-in-bits='32' id='5353c67e'/>
>     <pointer-type-def type-id='e095c704' size-in-bits='32' id='b9c88d6a'/>
>     <pointer-type-def type-id='3d7d8cbf' size-in-bits='32' id='a68021ce'/>
>+    <pointer-type-def type-id='05d4c620' size-in-bits='32' id='b8263143'/>
>+    <pointer-type-def type-id='ad707ada' size-in-bits='32' id='e90c4311'/>
>     <pointer-type-def type-id='b59d7dce' size-in-bits='32' id='78c01427'/>
>     <reference-type-def kind='lvalue' type-id='60f5da7d' size-in-bits='32' id='809cbcf9'/>
>     <reference-type-def kind='rvalue' type-id='60f5da7d' size-in-bits='32' id='55bd530d'/>
>@@ -5369,317 +5379,6 @@
>     <pointer-type-def type-id='c523b9f1' size-in-bits='32' id='323d93c1'/>
>     <pointer-type-def type-id='323d93c1' size-in-bits='32' id='01efdaf1'/>
>     <namespace-decl name='android'>
>-      <class-decl name='ScopedLock&lt;android::AssetManager2&gt;' size-in-bits='64' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='75' column='1' id='0bab9a0f'>
>-        <data-member access='private' layout-offset-in-bits='0'>
>-          <var-decl name='lock_' type-id='33591497' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='95' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='32'>
>-          <var-decl name='guarded_' type-id='439855fb' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='96' column='1'/>
>-        </data-member>
>-        <member-function access='public'>
>-          <function-decl name='ScopedLock' mangled-name='_ZN7android10ScopedLockINS_13AssetManager2EEC2ERNS_7GuardedIS1_EE' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='77' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='1ecbd0c7' is-artificial='yes'/>
>-            <parameter type-id='80661af2'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='private'>
>-          <function-decl name='ScopedLock' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='93' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='1ecbd0c7' is-artificial='yes'/>
>-            <parameter type-id='17520586'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>-      <class-decl name='AssetManager2' size-in-bits='3392' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='79' column='1' id='7c0ac937'>
>-        <member-type access='private'>
>-          <class-decl name='PackageGroup' size-in-bits='2464' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='337' column='1' id='1bec9f14'>
>-            <data-member access='public' layout-offset-in-bits='0'>
>-              <var-decl name='packages_' type-id='a5320295' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='339' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='96'>
>-              <var-decl name='cookies_' type-id='21156a1f' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='343' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='192'>
>-              <var-decl name='dynamic_ref_table' type-id='aaa6ccca' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='346' column='1'/>
>-            </data-member>
>-          </class-decl>
>-        </member-type>
>-        <member-type access='private'>
>-          <class-decl name='ConfiguredPackage' size-in-bits='736' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='325' column='1' id='01b8bd0d'>
>-            <data-member access='public' layout-offset-in-bits='0'>
>-              <var-decl name='loaded_package_' type-id='de64cf08' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='327' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='32'>
>-              <var-decl name='filtered_configs_' type-id='9337857f' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='332' column='1'/>
>-            </data-member>
>-          </class-decl>
>-        </member-type>
>-        <member-type access='private'>
>-          <class-decl name='FilteredConfigGroup' size-in-bits='192' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='319' column='1' id='238d5c19'>
>-            <data-member access='public' layout-offset-in-bits='0'>
>-              <var-decl name='configurations' type-id='2b166553' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='320' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='96'>
>-              <var-decl name='types' type-id='94c4b137' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='321' column='1'/>
>-            </data-member>
>-          </class-decl>
>-        </member-type>
>-        <member-type access='private'>
>-          <class-decl name='Resolution' size-in-bits='288' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='374' column='1' id='809a5d55'>
>-            <member-type access='public'>
>-              <class-decl name='Step' is-struct='yes' visibility='default' is-declaration-only='yes' id='88bb28ef'/>
>-            </member-type>
>-            <data-member access='public' layout-offset-in-bits='0'>
>-              <var-decl name='resid' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='395' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='32'>
>-              <var-decl name='cookie' type-id='27450c90' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='398' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='64'>
>-              <var-decl name='type_string_ref' type-id='90bf4c40' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='401' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='128'>
>-              <var-decl name='entry_string_ref' type-id='90bf4c40' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='404' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='192'>
>-              <var-decl name='steps' type-id='46ef0c57' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='407' column='1'/>
>-            </data-member>
>-          </class-decl>
>-        </member-type>
>-        <member-type access='private'>
>-          <class-decl name='ResourceName' is-struct='yes' visibility='default' is-declaration-only='yes' id='eb3e39c8'/>
>-        </member-type>
>-        <data-member access='private' layout-offset-in-bits='0'>
>-          <var-decl name='apk_assets_' type-id='736f4e77' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='315' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='96'>
>-          <var-decl name='package_groups_' type-id='1e763177' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='353' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='192'>
>-          <var-decl name='package_ids_' type-id='155e8fd8' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='357' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='2240'>
>-          <var-decl name='configuration_' type-id='f8926d95' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='361' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='2752'>
>-          <var-decl name='cached_bags_' type-id='6a671eb0' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='365' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='2912'>
>-          <var-decl name='cached_bag_resid_stacks_' type-id='6e9b5502' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='369' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='3072'>
>-          <var-decl name='resource_resolution_logging_enabled_' type-id='c894953d' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='372' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='3104'>
>-          <var-decl name='last_resolution' type-id='809a5d55' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='411' column='1'/>
>-        </data-member>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='AssetManager2' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='96' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='3f984faf' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='private' constructor='yes'>
>-          <function-decl name='AssetManager2' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='272' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='3f984faf' is-artificial='yes'/>
>-            <parameter type-id='66e4333c'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>-      <class-decl name='Mutex' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='94' column='1' id='406f4753'>
>-        <member-type access='private'>
>-          <class-decl name='Autolock' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='130' column='1' id='fd376fcf'>
>-            <data-member access='private' layout-offset-in-bits='0'>
>-              <var-decl name='mLock' type-id='665e3247' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='137' column='1'/>
>-            </data-member>
>-            <member-function access='public' constructor='yes'>
>-              <function-decl name='Autolock' mangled-name='_ZN7android5Mutex8AutolockC2ERS0_' filepath='system/core/libutils/include/utils/Mutex.h' line='132' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='40a3d947' is-artificial='yes'/>
>-                <parameter type-id='665e3247'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-            <member-function access='public' constructor='yes'>
>-              <function-decl name='Autolock' filepath='system/core/libutils/include/utils/Mutex.h' line='133' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='40a3d947' is-artificial='yes'/>
>-                <parameter type-id='5a5e1f63'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-            <member-function access='public' destructor='yes'>
>-              <function-decl name='~Autolock' mangled-name='_ZN7android5Mutex8AutolockD2Ev' filepath='system/core/libutils/include/utils/Mutex.h' line='134' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='40a3d947' is-artificial='yes'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-            <member-function access='private' constructor='yes'>
>-              <function-decl name='Autolock' filepath='system/core/libutils/include/utils/Mutex.h' line='139' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='40a3d947' is-artificial='yes'/>
>-                <parameter type-id='e38b5b64'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-          </class-decl>
>-        </member-type>
>-        <data-member access='private' layout-offset-in-bits='0'>
>-          <var-decl name='mMutex' type-id='7a6844eb' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='151' column='1'/>
>-        </data-member>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Mutex' mangled-name='_ZN7android5MutexC2Ev' filepath='system/core/libutils/include/utils/Mutex.h' line='101' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Mutex' filepath='system/core/libutils/include/utils/Mutex.h' line='102' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>-            <parameter type-id='80f4b756'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Mutex' filepath='system/core/libutils/include/utils/Mutex.h' line='103' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>-            <parameter type-id='95e97e5e'/>
>-            <parameter type-id='80f4b756'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' destructor='yes'>
>-          <function-decl name='~Mutex' mangled-name='_ZN7android5MutexD2Ev' filepath='system/core/libutils/include/utils/Mutex.h' line='104' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='private' constructor='yes'>
>-          <function-decl name='Mutex' filepath='system/core/libutils/include/utils/Mutex.h' line='147' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>-            <parameter type-id='43c128f8'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>-      <class-decl name='String16' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='39' column='1' id='c73fabea'>
>-        <member-type access='private'>
>-          <class-decl name='StaticData&lt;35&gt;' size-in-bits='608' is-struct='yes' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='154' column='1' id='6807f016'>
>-            <data-member access='public' layout-offset-in-bits='0'>
>-              <var-decl name='size' type-id='b9930aae' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='158' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='32'>
>-              <var-decl name='data' type-id='5da7196d' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='159' column='1'/>
>-            </data-member>
>-            <member-function access='public'>
>-              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='157' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='ba5970bc' is-artificial='yes'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-            <member-function access='public'>
>-              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='ba5970bc' is-artificial='yes'/>
>-                <parameter type-id='fbc5f4a1'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-          </class-decl>
>-        </member-type>
>-        <member-type access='private'>
>-          <class-decl name='StaticData&lt;38&gt;' size-in-bits='640' is-struct='yes' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='154' column='1' id='6a14bf2f'>
>-            <data-member access='public' layout-offset-in-bits='0'>
>-              <var-decl name='size' type-id='b9930aae' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='158' column='1'/>
>-            </data-member>
>-            <data-member access='public' layout-offset-in-bits='32'>
>-              <var-decl name='data' type-id='19b37a54' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='159' column='1'/>
>-            </data-member>
>-            <member-function access='public'>
>-              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='157' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='6ec90c77' is-artificial='yes'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-            <member-function access='public'>
>-              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
>-                <parameter type-id='6ec90c77' is-artificial='yes'/>
>-                <parameter type-id='a9d924c6'/>
>-                <return type-id='48b5725f'/>
>-              </function-decl>
>-            </member-function>
>-          </class-decl>
>-        </member-type>
>-        <data-member access='private' static='yes'>
>-          <var-decl name='kIsSharedBufferAllocated' type-id='b9930aae' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='121' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='0'>
>-          <var-decl name='mString' type-id='161c039a' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='142' column='1'/>
>-        </data-member>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='42' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='43' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <parameter type-id='157d4f95'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='44' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <parameter type-id='157d4f95'/>
>-            <parameter type-id='b59d7dce'/>
>-            <parameter type-id='b59d7dce'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='47' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <parameter type-id='161c039a'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='48' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <parameter type-id='161c039a'/>
>-            <parameter type-id='b59d7dce'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='49' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <parameter type-id='a1b8f99c'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='50' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <parameter type-id='80f4b756'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='51' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <parameter type-id='80f4b756'/>
>-            <parameter type-id='b59d7dce'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' destructor='yes'>
>-          <function-decl name='~String16' filepath='system/core/libutils/include/utils/String16.h' line='53' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='26924198' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>       <class-decl name='String8' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/String8.h' line='40' column='1' id='bacf3393'>
>         <data-member access='private' layout-offset-in-bits='0'>
>           <var-decl name='mString' type-id='80f4b756' visibility='default' filepath='system/core/libutils/include/utils/String8.h' line='229' column='1'/>
>@@ -5756,6 +5455,317 @@
>           </function-decl>
>         </member-function>
>       </class-decl>
>+      <class-decl name='ScopedLock&lt;android::AssetManager2&gt;' size-in-bits='64' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='75' column='1' id='0bab9a0f'>
>+        <data-member access='private' layout-offset-in-bits='0'>
>+          <var-decl name='lock_' type-id='33591497' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='95' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='32'>
>+          <var-decl name='guarded_' type-id='439855fb' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='96' column='1'/>
>+        </data-member>
>+        <member-function access='public'>
>+          <function-decl name='ScopedLock' mangled-name='_ZN7android10ScopedLockINS_13AssetManager2EEC2ERNS_7GuardedIS1_EE' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='77' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='1ecbd0c7' is-artificial='yes'/>
>+            <parameter type-id='80661af2'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='private'>
>+          <function-decl name='ScopedLock' filepath='frameworks/base/libs/androidfw/include/androidfw/MutexGuard.h' line='93' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='1ecbd0c7' is-artificial='yes'/>
>+            <parameter type-id='17520586'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>+      <class-decl name='AssetManager2' size-in-bits='3392' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='79' column='1' id='7c0ac937'>
>+        <member-type access='private'>
>+          <class-decl name='PackageGroup' size-in-bits='2464' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='337' column='1' id='1bec9f14'>
>+            <data-member access='public' layout-offset-in-bits='0'>
>+              <var-decl name='packages_' type-id='a5320295' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='339' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='96'>
>+              <var-decl name='cookies_' type-id='21156a1f' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='343' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='192'>
>+              <var-decl name='dynamic_ref_table' type-id='aaa6ccca' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='346' column='1'/>
>+            </data-member>
>+          </class-decl>
>+        </member-type>
>+        <member-type access='private'>
>+          <class-decl name='ConfiguredPackage' size-in-bits='736' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='325' column='1' id='01b8bd0d'>
>+            <data-member access='public' layout-offset-in-bits='0'>
>+              <var-decl name='loaded_package_' type-id='de64cf08' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='327' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='32'>
>+              <var-decl name='filtered_configs_' type-id='9337857f' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='332' column='1'/>
>+            </data-member>
>+          </class-decl>
>+        </member-type>
>+        <member-type access='private'>
>+          <class-decl name='FilteredConfigGroup' size-in-bits='192' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='319' column='1' id='238d5c19'>
>+            <data-member access='public' layout-offset-in-bits='0'>
>+              <var-decl name='configurations' type-id='2b166553' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='320' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='96'>
>+              <var-decl name='types' type-id='94c4b137' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='321' column='1'/>
>+            </data-member>
>+          </class-decl>
>+        </member-type>
>+        <member-type access='private'>
>+          <class-decl name='Resolution' size-in-bits='288' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='374' column='1' id='809a5d55'>
>+            <member-type access='public'>
>+              <class-decl name='Step' is-struct='yes' visibility='default' is-declaration-only='yes' id='88bb28ef'/>
>+            </member-type>
>+            <data-member access='public' layout-offset-in-bits='0'>
>+              <var-decl name='resid' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='395' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='32'>
>+              <var-decl name='cookie' type-id='27450c90' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='398' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='64'>
>+              <var-decl name='type_string_ref' type-id='90bf4c40' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='401' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='128'>
>+              <var-decl name='entry_string_ref' type-id='90bf4c40' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='404' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='192'>
>+              <var-decl name='steps' type-id='46ef0c57' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='407' column='1'/>
>+            </data-member>
>+          </class-decl>
>+        </member-type>
>+        <member-type access='private'>
>+          <class-decl name='ResourceName' is-struct='yes' visibility='default' is-declaration-only='yes' id='eb3e39c8'/>
>+        </member-type>
>+        <data-member access='private' layout-offset-in-bits='0'>
>+          <var-decl name='apk_assets_' type-id='736f4e77' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='315' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='96'>
>+          <var-decl name='package_groups_' type-id='1e763177' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='353' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='192'>
>+          <var-decl name='package_ids_' type-id='155e8fd8' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='357' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='2240'>
>+          <var-decl name='configuration_' type-id='f8926d95' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='361' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='2752'>
>+          <var-decl name='cached_bags_' type-id='6a671eb0' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='365' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='2912'>
>+          <var-decl name='cached_bag_resid_stacks_' type-id='6e9b5502' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='369' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='3072'>
>+          <var-decl name='resource_resolution_logging_enabled_' type-id='c894953d' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='372' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='3104'>
>+          <var-decl name='last_resolution' type-id='809a5d55' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='411' column='1'/>
>+        </data-member>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='AssetManager2' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='96' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='3f984faf' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='private' constructor='yes'>
>+          <function-decl name='AssetManager2' filepath='frameworks/base/libs/androidfw/include/androidfw/AssetManager2.h' line='272' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='3f984faf' is-artificial='yes'/>
>+            <parameter type-id='66e4333c'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>+      <class-decl name='Mutex' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='94' column='1' id='406f4753'>
>+        <member-type access='private'>
>+          <class-decl name='Autolock' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='130' column='1' id='fd376fcf'>
>+            <data-member access='private' layout-offset-in-bits='0'>
>+              <var-decl name='mLock' type-id='665e3247' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='137' column='1'/>
>+            </data-member>
>+            <member-function access='public' constructor='yes'>
>+              <function-decl name='Autolock' mangled-name='_ZN7android5Mutex8AutolockC2ERS0_' filepath='system/core/libutils/include/utils/Mutex.h' line='132' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='40a3d947' is-artificial='yes'/>
>+                <parameter type-id='665e3247'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+            <member-function access='public' constructor='yes'>
>+              <function-decl name='Autolock' filepath='system/core/libutils/include/utils/Mutex.h' line='133' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='40a3d947' is-artificial='yes'/>
>+                <parameter type-id='5a5e1f63'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+            <member-function access='public' destructor='yes'>
>+              <function-decl name='~Autolock' mangled-name='_ZN7android5Mutex8AutolockD2Ev' filepath='system/core/libutils/include/utils/Mutex.h' line='134' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='40a3d947' is-artificial='yes'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+            <member-function access='private' constructor='yes'>
>+              <function-decl name='Autolock' filepath='system/core/libutils/include/utils/Mutex.h' line='139' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='40a3d947' is-artificial='yes'/>
>+                <parameter type-id='e38b5b64'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+          </class-decl>
>+        </member-type>
>+        <data-member access='private' layout-offset-in-bits='0'>
>+          <var-decl name='mMutex' type-id='7a6844eb' visibility='default' filepath='system/core/libutils/include/utils/Mutex.h' line='151' column='1'/>
>+        </data-member>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Mutex' mangled-name='_ZN7android5MutexC2Ev' filepath='system/core/libutils/include/utils/Mutex.h' line='101' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Mutex' filepath='system/core/libutils/include/utils/Mutex.h' line='102' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>+            <parameter type-id='80f4b756'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Mutex' filepath='system/core/libutils/include/utils/Mutex.h' line='103' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>+            <parameter type-id='95e97e5e'/>
>+            <parameter type-id='80f4b756'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' destructor='yes'>
>+          <function-decl name='~Mutex' mangled-name='_ZN7android5MutexD2Ev' filepath='system/core/libutils/include/utils/Mutex.h' line='104' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='private' constructor='yes'>
>+          <function-decl name='Mutex' filepath='system/core/libutils/include/utils/Mutex.h' line='147' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='5a5e1f63' is-artificial='yes'/>
>+            <parameter type-id='43c128f8'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>+      <class-decl name='String16' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='39' column='1' id='c73fabea'>
>+        <member-type access='private'>
>+          <class-decl name='StaticData&lt;35&gt;' size-in-bits='608' is-struct='yes' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='154' column='1' id='6807f016'>
>+            <data-member access='public' layout-offset-in-bits='0'>
>+              <var-decl name='size' type-id='b9930aae' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='158' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='32'>
>+              <var-decl name='data' type-id='5da7196d' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='159' column='1'/>
>+            </data-member>
>+            <member-function access='public'>
>+              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='157' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='ba5970bc' is-artificial='yes'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+            <member-function access='public'>
>+              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='ba5970bc' is-artificial='yes'/>
>+                <parameter type-id='fbc5f4a1'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+          </class-decl>
>+        </member-type>
>+        <member-type access='private'>
>+          <class-decl name='StaticData&lt;38&gt;' size-in-bits='640' is-struct='yes' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='154' column='1' id='6a14bf2f'>
>+            <data-member access='public' layout-offset-in-bits='0'>
>+              <var-decl name='size' type-id='b9930aae' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='158' column='1'/>
>+            </data-member>
>+            <data-member access='public' layout-offset-in-bits='32'>
>+              <var-decl name='data' type-id='19b37a54' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='159' column='1'/>
>+            </data-member>
>+            <member-function access='public'>
>+              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='157' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='6ec90c77' is-artificial='yes'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+            <member-function access='public'>
>+              <function-decl name='StaticData' filepath='system/core/libutils/include/utils/String16.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
>+                <parameter type-id='6ec90c77' is-artificial='yes'/>
>+                <parameter type-id='a9d924c6'/>
>+                <return type-id='48b5725f'/>
>+              </function-decl>
>+            </member-function>
>+          </class-decl>
>+        </member-type>
>+        <data-member access='private' static='yes'>
>+          <var-decl name='kIsSharedBufferAllocated' type-id='b9930aae' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='121' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='0'>
>+          <var-decl name='mString' type-id='161c039a' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='142' column='1'/>
>+        </data-member>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='42' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='43' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <parameter type-id='157d4f95'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='44' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <parameter type-id='157d4f95'/>
>+            <parameter type-id='b59d7dce'/>
>+            <parameter type-id='b59d7dce'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='47' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <parameter type-id='161c039a'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='48' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <parameter type-id='161c039a'/>
>+            <parameter type-id='b59d7dce'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='49' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <parameter type-id='a1b8f99c'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='50' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <parameter type-id='80f4b756'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='String16' filepath='system/core/libutils/include/utils/String16.h' line='51' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <parameter type-id='80f4b756'/>
>+            <parameter type-id='b59d7dce'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' destructor='yes'>
>+          <function-decl name='~String16' filepath='system/core/libutils/include/utils/String16.h' line='53' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='26924198' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>       <class-decl name='LoadedPackage' size-in-bits='2400' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/LoadedArsc.h' line='87' column='1' id='e5242f33'>
>         <member-type access='private'>
>           <class-decl name='iterator' size-in-bits='128' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/LoadedArsc.h' line='89' column='1' id='83ab4f39'>
>@@ -6673,6 +6683,30 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;unsigned int, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='8051cbec'>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='8c787cb7' filepath='external/libcxx/include/memory' line='2136' column='1' id='ec61259e'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='572fd29c' filepath='external/libcxx/include/memory' line='2137' column='1' id='65eae572'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='f0981eeb' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='990b291a' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem&lt;int, void&gt;' mangled-name='_ZNSt3__122__compressed_pair_elemIjLi0ELb0EEC2IivEEOT_' filepath='external/libcxx/include/memory' line='2147' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='990b291a' is-artificial='yes'/>
>+              <parameter type-id='75f9e64a'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>         <class-decl name='__compressed_pair_elem&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;::__rep, 0, false&gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='fcbd9376'>
>           <member-type access='public'>
>             <typedef-decl name='reference' type-id='7da10fe5' filepath='external/libcxx/include/memory' line='2136' column='1' id='ce7899b0'/>
>@@ -6705,41 +6739,85 @@
>             <typedef-decl name='type' type-id='dca6e0a0' filepath='external/libcxx/include/memory' line='1031' column='1' id='bb139ded'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;int *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='cd94fd85'>
>+        <class-decl name='__size_type&lt;std::__1::allocator&lt;char&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='4c3d4c4d'>
>           <member-type access='public'>
>-            <typedef-decl name='reference' type-id='15f054ce' filepath='external/libcxx/include/memory' line='2136' column='1' id='036df83b'/>
>+            <typedef-decl name='type' type-id='be0739bd' filepath='external/libcxx/include/memory' line='1171' column='1' id='09c34d7a'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='521' column='1' id='249572b2'>
>           <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='dfe00273' filepath='external/libcxx/include/memory' line='2137' column='1' id='3af195fb'/>
>+            <typedef-decl name='value_type' type-id='c894953d' filepath='external/libcxx/include/type_traits' line='524' column='1' id='64c81de7'/>
>+          </member-type>
>+          <data-member access='public' static='yes'>
>+            <var-decl name='value' type-id='4ab96a04' visibility='default' filepath='external/libcxx/include/type_traits' line='523' column='1'/>
>+          </data-member>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;float, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='9884ef0e'>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='2a1f6799' filepath='external/libcxx/include/memory' line='2136' column='1' id='a9f1c79a'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='c047d328' filepath='external/libcxx/include/memory' line='2137' column='1' id='8564ccae'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='7292109c' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+            <var-decl name='__value_' type-id='a6c45d85' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>           </data-member>
>           <member-function access='public'>
>             <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='3e80e3d5' is-artificial='yes'/>
>+              <parameter type-id='24a161d4' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem&lt;float, void&gt;' mangled-name='_ZNSt3__122__compressed_pair_elemIfLi0ELb0EEC2IfvEEOT_' filepath='external/libcxx/include/memory' line='2147' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='24a161d4' is-artificial='yes'/>
>+              <parameter type-id='0e7051ad'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__size_type&lt;std::__1::allocator&lt;char&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='4c3d4c4d'>
>+        <class-decl name='__compressed_pair_elem&lt;int *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='cd94fd85'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='be0739bd' filepath='external/libcxx/include/memory' line='1171' column='1' id='09c34d7a'/>
>+            <typedef-decl name='reference' type-id='15f054ce' filepath='external/libcxx/include/memory' line='2136' column='1' id='036df83b'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='521' column='1' id='249572b2'>
>           <member-type access='public'>
>-            <typedef-decl name='value_type' type-id='c894953d' filepath='external/libcxx/include/type_traits' line='524' column='1' id='64c81de7'/>
>+            <typedef-decl name='const_reference' type-id='dfe00273' filepath='external/libcxx/include/memory' line='2137' column='1' id='3af195fb'/>
>           </member-type>
>-          <data-member access='public' static='yes'>
>-            <var-decl name='value' type-id='4ab96a04' visibility='default' filepath='external/libcxx/include/type_traits' line='523' column='1'/>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='7292109c' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>           </data-member>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='3e80e3d5' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>         </class-decl>
>         <class-decl name='allocator&lt;void&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='711' column='1' id='fbe09700'>
>           <member-type access='private'>
>             <typedef-decl name='const_pointer' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='715' column='1' id='4f0584a8'/>
>           </member-type>
>         </class-decl>
>+        <class-decl name='pointer_traits&lt;void *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='acf3e636'>
>+          <member-type access='public'>
>+            <typedef-decl name='rebind&lt;const long long&gt;' type-id='d5203fe9' filepath='external/libcxx/include/memory' line='979' column='1' id='4e49b384'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='rebind&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;' type-id='302e0f27' filepath='external/libcxx/include/memory' line='979' column='1' id='3487cb17'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='rebind&lt;std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt; &gt;' type-id='ff43352f' filepath='external/libcxx/include/memory' line='979' column='1' id='0e089b2b'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='pointer' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='974' column='1' id='66564fbc'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='rebind&lt;const unsigned int&gt;' type-id='5b2fd8e8' filepath='external/libcxx/include/memory' line='979' column='1' id='eb6fd916'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='c917df9f'/>
>+          </member-type>
>+        </class-decl>
>         <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='521' column='1' id='f4edc297'>
>           <member-type access='public'>
>             <typedef-decl name='value_type' type-id='c894953d' filepath='external/libcxx/include/type_traits' line='524' column='1' id='cc661894'/>
>@@ -7320,176 +7398,6 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='unordered_set&lt;unsigned int, std::__1::hash&lt;unsigned int&gt;, std::__1::equal_to&lt;unsigned int&gt;, std::__1::allocator&lt;unsigned int&gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/unordered_set' line='381' column='1' id='760319b5'>
>-          <member-type access='private'>
>-            <typedef-decl name='__table' type-id='d6a92829' filepath='external/libcxx/include/unordered_set' line='397' column='1' id='130d2c04'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='1a439916' filepath='external/libcxx/include/unordered_set' line='404' column='1' id='e8e34c1c'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='hasher' type-id='99463423' filepath='external/libcxx/include/unordered_set' line='387' column='1' id='908c82f9'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='key_equal' type-id='f9e4b3e7' filepath='external/libcxx/include/unordered_set' line='388' column='1' id='c214b7fe'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='d784bbd4' filepath='external/libcxx/include/unordered_set' line='389' column='1' id='dcd9dabc'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='2463b6a2' filepath='external/libcxx/include/unordered_set' line='407' column='1' id='94d90080'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='2463b6a2' filepath='external/libcxx/include/unordered_set' line='408' column='1' id='ecb1aaf0'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='eb92ad4a' filepath='external/libcxx/include/unordered_set' line='386' column='1' id='439e0f3c'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='key_type' type-id='f0981eeb' filepath='external/libcxx/include/unordered_set' line='385' column='1' id='eb92ad4a'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='insert_return_type' type-id='f1f008a4' filepath='external/libcxx/include/unordered_set' line='414' column='1' id='484916c7'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='node_type' type-id='4b9dc929' filepath='external/libcxx/include/unordered_set' line='413' column='1' id='f7a24e73'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='local_iterator' type-id='0b83e53e' filepath='external/libcxx/include/unordered_set' line='409' column='1' id='b566fd90'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_local_iterator' type-id='0b83e53e' filepath='external/libcxx/include/unordered_set' line='410' column='1' id='172aba60'/>
>-          </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__table_' type-id='130d2c04' visibility='default' filepath='external/libcxx/include/unordered_set' line='399' column='1'/>
>-          </data-member>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='423' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='430' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='307407bd'/>
>-              <parameter type-id='660d3118'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='434' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='437' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='307407bd'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='440' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='307407bd'/>
>-              <parameter type-id='660d3118'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='464' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='465' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='f76259e0'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='466' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='f76259e0'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='469' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='923a5af5'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='471' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='923a5af5'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='472' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='70118403'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='473' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='70118403'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='307407bd'/>
>-              <parameter type-id='660d3118'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='476' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='70118403'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='307407bd'/>
>-              <parameter type-id='660d3118'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='481' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='70118403'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='485' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2bca2025' is-artificial='yes'/>
>-              <parameter type-id='70118403'/>
>-              <parameter type-id='e8e34c1c'/>
>-              <parameter type-id='307407bd'/>
>-              <parameter type-id='044f291e'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-        </class-decl>
>         <class-decl name='vector&lt;android::AssetManager2::ConfiguredPackage, std::__1::allocator&lt;android::AssetManager2::ConfiguredPackage&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='a5320295'>
>           <base-class access='private' layout-offset-in-bits='0' type-id='6a81bf9f'/>
>           <member-type access='private'>
>@@ -7622,6 +7530,176 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>+        <class-decl name='unordered_set&lt;unsigned int, std::__1::hash&lt;unsigned int&gt;, std::__1::equal_to&lt;unsigned int&gt;, std::__1::allocator&lt;unsigned int&gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/unordered_set' line='381' column='1' id='760319b5'>
>+          <member-type access='private'>
>+            <typedef-decl name='__table' type-id='d6a92829' filepath='external/libcxx/include/unordered_set' line='397' column='1' id='130d2c04'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='size_type' type-id='1a439916' filepath='external/libcxx/include/unordered_set' line='404' column='1' id='e8e34c1c'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='hasher' type-id='99463423' filepath='external/libcxx/include/unordered_set' line='387' column='1' id='908c82f9'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='key_equal' type-id='f9e4b3e7' filepath='external/libcxx/include/unordered_set' line='388' column='1' id='c214b7fe'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='allocator_type' type-id='d784bbd4' filepath='external/libcxx/include/unordered_set' line='389' column='1' id='dcd9dabc'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='iterator' type-id='2463b6a2' filepath='external/libcxx/include/unordered_set' line='407' column='1' id='94d90080'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='const_iterator' type-id='2463b6a2' filepath='external/libcxx/include/unordered_set' line='408' column='1' id='ecb1aaf0'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='value_type' type-id='eb92ad4a' filepath='external/libcxx/include/unordered_set' line='386' column='1' id='439e0f3c'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='key_type' type-id='f0981eeb' filepath='external/libcxx/include/unordered_set' line='385' column='1' id='eb92ad4a'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='insert_return_type' type-id='f1f008a4' filepath='external/libcxx/include/unordered_set' line='414' column='1' id='484916c7'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='node_type' type-id='4b9dc929' filepath='external/libcxx/include/unordered_set' line='413' column='1' id='f7a24e73'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='local_iterator' type-id='0b83e53e' filepath='external/libcxx/include/unordered_set' line='409' column='1' id='b566fd90'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='const_local_iterator' type-id='0b83e53e' filepath='external/libcxx/include/unordered_set' line='410' column='1' id='172aba60'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__table_' type-id='130d2c04' visibility='default' filepath='external/libcxx/include/unordered_set' line='399' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='423' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='430' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='307407bd'/>
>+              <parameter type-id='660d3118'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='434' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='437' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='307407bd'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='440' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='307407bd'/>
>+              <parameter type-id='660d3118'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='464' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='465' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='f76259e0'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='466' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='f76259e0'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='469' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='923a5af5'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='471' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='923a5af5'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='472' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='70118403'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='473' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='70118403'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='307407bd'/>
>+              <parameter type-id='660d3118'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='476' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='70118403'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='307407bd'/>
>+              <parameter type-id='660d3118'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='481' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='70118403'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_set' filepath='external/libcxx/include/unordered_set' line='485' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='2bca2025' is-artificial='yes'/>
>+              <parameter type-id='70118403'/>
>+              <parameter type-id='e8e34c1c'/>
>+              <parameter type-id='307407bd'/>
>+              <parameter type-id='044f291e'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>         <class-decl name='__vector_base&lt;android::AssetManager2::ConfiguredPackage, std::__1::allocator&lt;android::AssetManager2::ConfiguredPackage&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='326' column='1' id='6a81bf9f'>
>           <base-class access='protected' layout-offset-in-bits='0' type-id='2328d49c'/>
>           <member-type access='private'>
>@@ -9027,30 +9105,6 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;unsigned int, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='8051cbec'>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='8c787cb7' filepath='external/libcxx/include/memory' line='2136' column='1' id='ec61259e'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='572fd29c' filepath='external/libcxx/include/memory' line='2137' column='1' id='65eae572'/>
>-          </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='f0981eeb' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>-          </data-member>
>-          <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='990b291a' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem&lt;int, void&gt;' mangled-name='_ZNSt3__122__compressed_pair_elemIjLi0ELb0EEC2IivEEOT_' filepath='external/libcxx/include/memory' line='2147' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='990b291a' is-artificial='yes'/>
>-              <parameter type-id='75f9e64a'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-        </class-decl>
>         <class-decl name='__wrap_iter&lt;const std::__1::pair&lt;android::OverlayableInfo, std::__1::unordered_set&lt;unsigned int, std::__1::hash&lt;unsigned int&gt;, std::__1::equal_to&lt;unsigned int&gt;, std::__1::allocator&lt;unsigned int&gt; &gt; &gt; *&gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/iterator' line='1315' column='1' id='a122f21c'>
>           <member-type access='private'>
>             <typedef-decl name='iterator_type' type-id='53ec7eed' filepath='external/libcxx/include/iterator' line='1318' column='1' id='0a2e44e2'/>
>@@ -9565,30 +9619,6 @@
>             <typedef-decl name='const_void_pointer' type-id='73e7820e' filepath='external/libcxx/include/memory' line='1520' column='1' id='2887369f'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;float, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='9884ef0e'>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='2a1f6799' filepath='external/libcxx/include/memory' line='2136' column='1' id='a9f1c79a'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='c047d328' filepath='external/libcxx/include/memory' line='2137' column='1' id='8564ccae'/>
>-          </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='a6c45d85' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>-          </data-member>
>-          <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='24a161d4' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem&lt;float, void&gt;' mangled-name='_ZNSt3__122__compressed_pair_elemIfLi0ELb0EEC2IfvEEOT_' filepath='external/libcxx/include/memory' line='2147' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='24a161d4' is-artificial='yes'/>
>-              <parameter type-id='0e7051ad'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-        </class-decl>
>         <class-decl name='__pointer_type&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; &gt;, void *&gt; *&gt; *, std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; &gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='9bf5a3c4'>
>           <member-type access='public'>
>             <typedef-decl name='type' type-id='43211cdc' filepath='external/libcxx/include/memory' line='1031' column='1' id='576adeed'/>
>@@ -10293,26 +10323,6 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='pointer_traits&lt;void *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='acf3e636'>
>-          <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='974' column='1' id='66564fbc'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='rebind&lt;const unsigned int&gt;' type-id='5b2fd8e8' filepath='external/libcxx/include/memory' line='979' column='1' id='eb6fd916'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='rebind&lt;const long long&gt;' type-id='d5203fe9' filepath='external/libcxx/include/memory' line='979' column='1' id='4e49b384'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='rebind&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;' type-id='302e0f27' filepath='external/libcxx/include/memory' line='979' column='1' id='3487cb17'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='rebind&lt;std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt; &gt;' type-id='ff43352f' filepath='external/libcxx/include/memory' line='979' column='1' id='0e089b2b'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='c917df9f'/>
>-          </member-type>
>-        </class-decl>
>         <class-decl name='vector&lt;android::ResTable_config, std::__1::allocator&lt;android::ResTable_config&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='2b166553'>
>           <base-class access='private' layout-offset-in-bits='0' type-id='86513975'/>
>           <member-type access='private'>
>@@ -12016,15 +12026,6 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='aligned_storage&lt;12, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1777' column='1' id='363cf3bc'>
>-          <member-type access='public'>
>-            <class-decl name='type' size-in-bits='128' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1777' column='1' id='b876f710'>
>-              <data-member access='public' layout-offset-in-bits='0'>
>-                <var-decl name='__lx' type-id='92a46553' visibility='default' filepath='external/libcxx/include/type_traits' line='1777' column='1'/>
>-              </data-member>
>-            </class-decl>
>-          </member-type>
>-        </class-decl>
>         <class-decl name='__compressed_pair&lt;float, std::__1::__unordered_map_equal&lt;unsigned int, std::__1::__hash_value_type&lt;unsigned int, android::util::unique_cptr&lt;android::ResolvedBag&gt; &gt;, std::__1::equal_to&lt;unsigned int&gt;, true&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='d22df4cd'>
>           <base-class access='private' layout-offset-in-bits='0' type-id='9884ef0e'/>
>           <base-class access='private' layout-offset-in-bits='0' type-id='9e7f15b0'/>
>@@ -12972,6 +12973,15 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>+        <class-decl name='aligned_storage&lt;12, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1777' column='1' id='363cf3bc'>
>+          <member-type access='public'>
>+            <class-decl name='type' size-in-bits='128' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1777' column='1' id='b876f710'>
>+              <data-member access='public' layout-offset-in-bits='0'>
>+                <var-decl name='__lx' type-id='92a46553' visibility='default' filepath='external/libcxx/include/type_traits' line='1777' column='1'/>
>+              </data-member>
>+            </class-decl>
>+          </member-type>
>+        </class-decl>
>         <typedef-decl name='__map_node_handle&lt;std::__1::unordered_map&lt;unsigned int, std::__1::vector&lt;unsigned int, std::__1::allocator&lt;unsigned int&gt; &gt;, std::__1::hash&lt;unsigned int&gt;, std::__1::equal_to&lt;unsigned int&gt;, std::__1::allocator&lt;std::__1::pair&lt;const unsigned int, std::__1::vector&lt;unsigned int, std::__1::allocator&lt;unsigned int&gt; &gt; &gt; &gt; &gt;::__node, std::__1::unordered_map&lt;unsigned int, std::__1::vector&lt;unsigned int, std::__1::allocator&lt;unsigned int&gt; &gt;, std::__1::hash&lt;unsigned int&gt;, std::__1::equal_to&lt;unsigned int&gt;, std::__1::allocator&lt;std::__1::pair&lt;const unsigned int, std::__1::vector&lt;unsigned int, std::__1::allocator&lt;unsigned int&gt; &gt; &gt; &gt; &gt;::allocator_type&gt;' type-id='b565a125' filepath='external/libcxx/include/__node_handle' line='193' column='1' id='50a7f812'/>
>         <class-decl name='vector&lt;android::AssetManager2::Resolution::Step, std::__1::allocator&lt;android::AssetManager2::Resolution::Step&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='46ef0c57'>
>           <base-class access='private' layout-offset-in-bits='0' type-id='97ba1631'/>
>@@ -15012,6 +15022,92 @@
>       <parameter type-id='d6ad37ff'/>
>       <return type-id='b59d7dce'/>
>     </function-decl>
>+    <function-decl name='AAssetManager_fromJava' mangled-name='AAssetManager_fromJava' filepath='frameworks/base/native/android/asset_manager.cpp' line='61' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAssetManager_fromJava@@LIBANDROID'>

... and here we see it working. :-)

>+      <parameter type-id='fae49a1f' name='env' filepath='frameworks/base/native/android/asset_manager.cpp' line='61' column='1'/>
>+      <parameter type-id='96f3d089' name='assetManager' filepath='frameworks/base/native/android/asset_manager.cpp' line='61' column='1'/>
>+      <return type-id='081c2b23'/>
>+    </function-decl>
>+    <function-decl name='AAssetManager_open' mangled-name='AAssetManager_open' filepath='frameworks/base/native/android/asset_manager.cpp' line='66' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAssetManager_open@@LIBANDROID'>
>+      <parameter type-id='081c2b23' name='amgr' filepath='frameworks/base/native/android/asset_manager.cpp' line='66' column='1'/>
>+      <parameter type-id='80f4b756' name='filename' filepath='frameworks/base/native/android/asset_manager.cpp' line='66' column='1'/>
>+      <parameter type-id='95e97e5e' name='mode' filepath='frameworks/base/native/android/asset_manager.cpp' line='66' column='1'/>
>+      <return type-id='57d98aaa'/>
>+    </function-decl>
>+    <function-decl name='AAssetManager_openDir' mangled-name='AAssetManager_openDir' filepath='frameworks/base/native/android/asset_manager.cpp' line='94' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAssetManager_openDir@@LIBANDROID'>
>+      <parameter type-id='081c2b23' name='amgr' filepath='frameworks/base/native/android/asset_manager.cpp' line='94' column='1'/>
>+      <parameter type-id='80f4b756' name='dirName' filepath='frameworks/base/native/android/asset_manager.cpp' line='94' column='1'/>
>+      <return type-id='1cdc10c3'/>
>+    </function-decl>
>+    <function-decl name='AAssetDir_getNextFileName' mangled-name='AAssetDir_getNextFileName' filepath='frameworks/base/native/android/asset_manager.cpp' line='104' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAssetDir_getNextFileName@@LIBANDROID'>
>+      <parameter type-id='1cdc10c3' name='assetDir' filepath='frameworks/base/native/android/asset_manager.cpp' line='104' column='1'/>
>+      <return type-id='80f4b756'/>
>+    </function-decl>
>+    <function-decl name='AAssetDir_rewind' mangled-name='AAssetDir_rewind' filepath='frameworks/base/native/android/asset_manager.cpp' line='129' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAssetDir_rewind@@LIBANDROID'>
>+      <parameter type-id='1cdc10c3' name='assetDir' filepath='frameworks/base/native/android/asset_manager.cpp' line='129' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AAssetDir_close' mangled-name='AAssetDir_close' filepath='frameworks/base/native/android/asset_manager.cpp' line='140' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAssetDir_close@@LIBANDROID'>
>+      <parameter type-id='1cdc10c3' name='assetDir' filepath='frameworks/base/native/android/asset_manager.cpp' line='129' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AAsset_read' mangled-name='AAsset_read' filepath='frameworks/base/native/android/asset_manager.cpp' line='149' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_read@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='149' column='1'/>
>+      <parameter type-id='eaa32e2f' name='buf' filepath='frameworks/base/native/android/asset_manager.cpp' line='149' column='1'/>
>+      <parameter type-id='b59d7dce' name='count' filepath='frameworks/base/native/android/asset_manager.cpp' line='149' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='AAsset_seek' mangled-name='AAsset_seek' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_seek@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1'/>
>+      <parameter type-id='ad707ada' name='offset' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1'/>
>+      <parameter type-id='95e97e5e' name='whence' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1'/>
>+      <return type-id='ad707ada'/>
>+    </function-decl>
>+    <function-decl name='AAsset_seek64' mangled-name='AAsset_seek64' filepath='frameworks/base/native/android/asset_manager.cpp' line='159' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_seek64@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='159' column='1'/>
>+      <parameter type-id='05d4c620' name='offset' filepath='frameworks/base/native/android/asset_manager.cpp' line='159' column='1'/>
>+      <parameter type-id='95e97e5e' name='whence' filepath='frameworks/base/native/android/asset_manager.cpp' line='159' column='1'/>
>+      <return type-id='05d4c620'/>
>+    </function-decl>
>+    <function-decl name='AAsset_close' mangled-name='AAsset_close' filepath='frameworks/base/native/android/asset_manager.cpp' line='164' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_close@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='164' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AAsset_getBuffer' mangled-name='AAsset_getBuffer' filepath='frameworks/base/native/android/asset_manager.cpp' line='170' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getBuffer@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='170' column='1'/>
>+      <return type-id='eaa32e2f'/>
>+    </function-decl>
>+    <function-decl name='AAsset_getLength' mangled-name='AAsset_getLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='175' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getLength@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='175' column='1'/>
>+      <return type-id='ad707ada'/>
>+    </function-decl>
>+    <function-decl name='AAsset_getLength64' mangled-name='AAsset_getLength64' filepath='frameworks/base/native/android/asset_manager.cpp' line='180' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getLength64@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='180' column='1'/>
>+      <return type-id='05d4c620'/>
>+    </function-decl>
>+    <function-decl name='AAsset_getRemainingLength' mangled-name='AAsset_getRemainingLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getRemainingLength@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='175' column='1'/>
>+      <return type-id='ad707ada'/>
>+    </function-decl>
>+    <function-decl name='AAsset_getRemainingLength64' mangled-name='AAsset_getRemainingLength64' filepath='frameworks/base/native/android/asset_manager.cpp' line='190' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getRemainingLength64@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='180' column='1'/>
>+      <return type-id='05d4c620'/>
>+    </function-decl>
>+    <function-decl name='AAsset_openFileDescriptor' mangled-name='AAsset_openFileDescriptor' filepath='frameworks/base/native/android/asset_manager.cpp' line='195' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_openFileDescriptor@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='195' column='1'/>
>+      <parameter type-id='e90c4311' name='outStart' filepath='frameworks/base/native/android/asset_manager.cpp' line='195' column='1'/>
>+      <parameter type-id='e90c4311' name='outLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='195' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='AAsset_openFileDescriptor64' mangled-name='AAsset_openFileDescriptor64' filepath='frameworks/base/native/android/asset_manager.cpp' line='206' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_openFileDescriptor64@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='206' column='1'/>
>+      <parameter type-id='b8263143' name='outStart' filepath='frameworks/base/native/android/asset_manager.cpp' line='206' column='1'/>
>+      <parameter type-id='b8263143' name='outLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='206' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='AAsset_isAllocated' mangled-name='AAsset_isAllocated' filepath='frameworks/base/native/android/asset_manager.cpp' line='211' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_isAllocated@@LIBANDROID'>
>+      <parameter type-id='57d98aaa' name='asset' filepath='frameworks/base/native/android/asset_manager.cpp' line='211' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>     <class-decl name='_JavaVM' is-struct='yes' visibility='default' is-declaration-only='yes' id='d607eddf'/>
>     <class-decl name='__sFILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='8d7b2c1e'/>
>     <class-decl name='_jbooleanArray' visibility='default' is-declaration-only='yes' id='2ca86b0d'/>
>@@ -17014,6 +17110,8 @@
>     <typedef-decl name='AChoreographer_frameCallback' type-id='b877ce2b' filepath='frameworks/native/include/android/choreographer.h' line='45' column='1' id='f687fd19'/>
>     <typedef-decl name='AChoreographer_frameCallback64' type-id='938a712d' filepath='frameworks/native/include/android/choreographer.h' line='55' column='1' id='acccec6b'/>
>     <typedef-decl name='pthread_t' type-id='bd54fe1a' filepath='bionic/libc/include/bits/pthread_types.h' line='104' column='1' id='4051f5e7'/>
>+    <typedef-decl name='AChoreographer' type-id='d1af9805' filepath='frameworks/native/include/android/choreographer.h' line='35' column='1' id='7b0c0278'/>
>+    <pointer-type-def type-id='7b0c0278' size-in-bits='32' id='136b85b5'/>
>     <pointer-type-def type-id='cc3d65c7' size-in-bits='32' id='8567d8b0'/>
>     <pointer-type-def type-id='18a91261' size-in-bits='32' id='8693cef9'/>
>     <pointer-type-def type-id='5671eca3' size-in-bits='32' id='ddc6bda3'/>
>@@ -17784,11 +17882,6 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='enable_if&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='441' column='1' id='065482ca'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='48b5725f' filepath='external/libcxx/include/type_traits' line='441' column='1' id='0eccec79'/>
>-          </member-type>
>-        </class-decl>
>         <class-decl name='__wrap_iter&lt;android::FrameCallback *&gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/iterator' line='1315' column='1' id='f75e2e7d'>
>           <member-type access='private'>
>             <typedef-decl name='iterator_type' type-id='f2ba9af4' filepath='external/libcxx/include/iterator' line='1318' column='1' id='6556e951'/>
>@@ -17846,6 +17939,11 @@
>             <typedef-decl name='type' type-id='a78ceb8e' filepath='external/libcxx/include/type_traits' line='657' column='1' id='bf4a5c64'/>
>           </member-type>
>         </class-decl>
>+        <class-decl name='enable_if&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='441' column='1' id='065482ca'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='48b5725f' filepath='external/libcxx/include/type_traits' line='441' column='1' id='0eccec79'/>
>+          </member-type>
>+        </class-decl>
>         <class-decl name='__split_buffer&lt;android::FrameCallback, std::__1::allocator&lt;android::FrameCallback&gt; &amp;&gt;' size-in-bits='160' is-struct='yes' visibility='default' filepath='external/libcxx/include/__split_buffer' line='28' column='1' id='7a5ec2c5'>
>           <base-class access='private' layout-offset-in-bits='0' type-id='d0795f80'/>
>           <member-type access='public'>
>@@ -18083,6 +18181,36 @@
>       <parameter type-id='8567d8b0'/>
>       <return type-id='95e97e5e'/>
>     </function-decl>
>+    <function-decl name='AChoreographer_getInstance' mangled-name='AChoreographer_getInstance' filepath='frameworks/base/native/android/choreographer.cpp' line='202' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AChoreographer_getInstance@@LIBANDROID'>
>+      <return type-id='136b85b5'/>
>+    </function-decl>
>+    <function-decl name='AChoreographer_postFrameCallback' mangled-name='AChoreographer_postFrameCallback' filepath='frameworks/base/native/android/choreographer.cpp' line='206' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AChoreographer_postFrameCallback@@LIBANDROID'>
>+      <parameter type-id='136b85b5' name='choreographer' filepath='frameworks/base/native/android/choreographer.cpp' line='206' column='1'/>
>+      <parameter type-id='f687fd19' name='callback' filepath='frameworks/base/native/android/choreographer.cpp' line='207' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/choreographer.cpp' line='207' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AChoreographer_postFrameCallbackDelayed' mangled-name='AChoreographer_postFrameCallbackDelayed' filepath='frameworks/base/native/android/choreographer.cpp' line='211' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AChoreographer_postFrameCallbackDelayed@@LIBANDROID'>
>+      <parameter type-id='136b85b5' name='choreographer' filepath='frameworks/base/native/android/choreographer.cpp' line='211' column='1'/>
>+      <parameter type-id='f687fd19' name='callback' filepath='frameworks/base/native/android/choreographer.cpp' line='212' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/choreographer.cpp' line='212' column='1'/>
>+      <parameter type-id='bd54fe1a' name='delayMillis' filepath='frameworks/base/native/android/choreographer.cpp' line='212' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AChoreographer_postFrameCallback64' mangled-name='AChoreographer_postFrameCallback64' filepath='frameworks/base/native/android/choreographer.cpp' line='216' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AChoreographer_postFrameCallback64@@LIBANDROID'>
>+      <parameter type-id='136b85b5' name='choreographer' filepath='frameworks/base/native/android/choreographer.cpp' line='216' column='1'/>
>+      <parameter type-id='acccec6b' name='callback' filepath='frameworks/base/native/android/choreographer.cpp' line='217' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/choreographer.cpp' line='217' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AChoreographer_postFrameCallbackDelayed64' mangled-name='AChoreographer_postFrameCallbackDelayed64' filepath='frameworks/base/native/android/choreographer.cpp' line='221' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AChoreographer_postFrameCallbackDelayed64@@LIBANDROID'>
>+      <parameter type-id='136b85b5' name='choreographer' filepath='frameworks/base/native/android/choreographer.cpp' line='221' column='1'/>
>+      <parameter type-id='acccec6b' name='callback' filepath='frameworks/base/native/android/choreographer.cpp' line='222' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/choreographer.cpp' line='222' column='1'/>
>+      <parameter type-id='8f92235e' name='delayMillis' filepath='frameworks/base/native/android/choreographer.cpp' line='222' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <class-decl name='AChoreographer' is-struct='yes' visibility='default' is-declaration-only='yes' id='d1af9805'/>
>     <function-type size-in-bits='32' id='09ecfd6f'>
>       <parameter type-id='bd54fe1a'/>
>       <parameter type-id='eaa32e2f'/>
>@@ -18095,13 +18223,259 @@
>     </function-type>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/configuration.cpp' language='LANG_C_plus_plus_14'>
>+    <typedef-decl name='AConfiguration' type-id='9896136e' filepath='frameworks/native/include/android/configuration.h' line='50' column='1' id='11179a67'/>
>+    <class-decl name='AConfiguration' size-in-bits='512' is-struct='yes' visibility='default' filepath='frameworks/base/core/jni/include/android_runtime/android_content_res_Configuration.h' line='25' column='1' id='9896136e'>
>+      <base-class access='public' layout-offset-in-bits='0' type-id='f8926d95'/>
>+    </class-decl>
>+    <pointer-type-def type-id='11179a67' size-in-bits='32' id='138c2704'/>
>+    <function-decl name='AConfiguration_new' mangled-name='AConfiguration_new' filepath='frameworks/base/native/android/configuration.cpp' line='27' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_new@@LIBANDROID'>
>+      <return type-id='138c2704'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_delete' mangled-name='AConfiguration_delete' filepath='frameworks/base/native/android/configuration.cpp' line='33' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_delete@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='33' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_fromAssetManager' mangled-name='AConfiguration_fromAssetManager' filepath='frameworks/base/native/android/configuration.cpp' line='37' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_fromAssetManager@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='out' filepath='frameworks/base/native/android/configuration.cpp' line='37' column='1'/>
>+      <parameter type-id='081c2b23' name='am' filepath='frameworks/base/native/android/configuration.cpp' line='37' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_copy' mangled-name='AConfiguration_copy' filepath='frameworks/base/native/android/configuration.cpp' line='45' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_copy@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='dest' filepath='frameworks/base/native/android/configuration.cpp' line='45' column='1'/>
>+      <parameter type-id='138c2704' name='src' filepath='frameworks/base/native/android/configuration.cpp' line='45' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getMcc' mangled-name='AConfiguration_getMcc' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getMcc@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getMnc' mangled-name='AConfiguration_getMnc' filepath='frameworks/base/native/android/configuration.cpp' line='53' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getMnc@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getLanguage' mangled-name='AConfiguration_getLanguage' filepath='frameworks/base/native/android/configuration.cpp' line='57' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getLanguage@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='57' column='1'/>
>+      <parameter type-id='26a90f95' name='outLanguage' filepath='frameworks/base/native/android/configuration.cpp' line='57' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getCountry' mangled-name='AConfiguration_getCountry' filepath='frameworks/base/native/android/configuration.cpp' line='62' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getCountry@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='57' column='1'/>
>+      <parameter type-id='26a90f95' name='outLanguage' filepath='frameworks/base/native/android/configuration.cpp' line='57' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getOrientation' mangled-name='AConfiguration_getOrientation' filepath='frameworks/base/native/android/configuration.cpp' line='67' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getOrientation@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getTouchscreen' mangled-name='AConfiguration_getTouchscreen' filepath='frameworks/base/native/android/configuration.cpp' line='71' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getTouchscreen@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getDensity' mangled-name='AConfiguration_getDensity' filepath='frameworks/base/native/android/configuration.cpp' line='75' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getDensity@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getKeyboard' mangled-name='AConfiguration_getKeyboard' filepath='frameworks/base/native/android/configuration.cpp' line='79' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getKeyboard@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getNavigation' mangled-name='AConfiguration_getNavigation' filepath='frameworks/base/native/android/configuration.cpp' line='83' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getNavigation@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getKeysHidden' mangled-name='AConfiguration_getKeysHidden' filepath='frameworks/base/native/android/configuration.cpp' line='87' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getKeysHidden@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getNavHidden' mangled-name='AConfiguration_getNavHidden' filepath='frameworks/base/native/android/configuration.cpp' line='91' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getNavHidden@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getSdkVersion' mangled-name='AConfiguration_getSdkVersion' filepath='frameworks/base/native/android/configuration.cpp' line='96' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getSdkVersion@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getScreenSize' mangled-name='AConfiguration_getScreenSize' filepath='frameworks/base/native/android/configuration.cpp' line='100' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getScreenSize@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getScreenLong' mangled-name='AConfiguration_getScreenLong' filepath='frameworks/base/native/android/configuration.cpp' line='104' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getScreenLong@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getScreenRound' mangled-name='AConfiguration_getScreenRound' filepath='frameworks/base/native/android/configuration.cpp' line='109' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getScreenRound@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getUiModeType' mangled-name='AConfiguration_getUiModeType' filepath='frameworks/base/native/android/configuration.cpp' line='113' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getUiModeType@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getUiModeNight' mangled-name='AConfiguration_getUiModeNight' filepath='frameworks/base/native/android/configuration.cpp' line='117' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getUiModeNight@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getScreenWidthDp' mangled-name='AConfiguration_getScreenWidthDp' filepath='frameworks/base/native/android/configuration.cpp' line='123' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getScreenWidthDp@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getScreenHeightDp' mangled-name='AConfiguration_getScreenHeightDp' filepath='frameworks/base/native/android/configuration.cpp' line='127' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getScreenHeightDp@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getSmallestScreenWidthDp' mangled-name='AConfiguration_getSmallestScreenWidthDp' filepath='frameworks/base/native/android/configuration.cpp' line='131' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getSmallestScreenWidthDp@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_getLayoutDirection' mangled-name='AConfiguration_getLayoutDirection' filepath='frameworks/base/native/android/configuration.cpp' line='135' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_getLayoutDirection@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='49' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setMcc' mangled-name='AConfiguration_setMcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setMcc@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setMnc' mangled-name='AConfiguration_setMnc' filepath='frameworks/base/native/android/configuration.cpp' line='146' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setMnc@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setLanguage' mangled-name='AConfiguration_setLanguage' filepath='frameworks/base/native/android/configuration.cpp' line='150' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setLanguage@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='150' column='1'/>
>+      <parameter type-id='80f4b756' name='language' filepath='frameworks/base/native/android/configuration.cpp' line='150' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setCountry' mangled-name='AConfiguration_setCountry' filepath='frameworks/base/native/android/configuration.cpp' line='155' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setCountry@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='150' column='1'/>
>+      <parameter type-id='80f4b756' name='language' filepath='frameworks/base/native/android/configuration.cpp' line='150' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setOrientation' mangled-name='AConfiguration_setOrientation' filepath='frameworks/base/native/android/configuration.cpp' line='160' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setOrientation@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setTouchscreen' mangled-name='AConfiguration_setTouchscreen' filepath='frameworks/base/native/android/configuration.cpp' line='164' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setTouchscreen@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setDensity' mangled-name='AConfiguration_setDensity' filepath='frameworks/base/native/android/configuration.cpp' line='168' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setDensity@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setKeyboard' mangled-name='AConfiguration_setKeyboard' filepath='frameworks/base/native/android/configuration.cpp' line='172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setKeyboard@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setNavigation' mangled-name='AConfiguration_setNavigation' filepath='frameworks/base/native/android/configuration.cpp' line='176' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setNavigation@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setKeysHidden' mangled-name='AConfiguration_setKeysHidden' filepath='frameworks/base/native/android/configuration.cpp' line='180' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setKeysHidden@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setNavHidden' mangled-name='AConfiguration_setNavHidden' filepath='frameworks/base/native/android/configuration.cpp' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setNavHidden@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setSdkVersion' mangled-name='AConfiguration_setSdkVersion' filepath='frameworks/base/native/android/configuration.cpp' line='190' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setSdkVersion@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setScreenSize' mangled-name='AConfiguration_setScreenSize' filepath='frameworks/base/native/android/configuration.cpp' line='194' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setScreenSize@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setScreenLong' mangled-name='AConfiguration_setScreenLong' filepath='frameworks/base/native/android/configuration.cpp' line='199' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setScreenLong@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setUiModeType' mangled-name='AConfiguration_setUiModeType' filepath='frameworks/base/native/android/configuration.cpp' line='209' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setUiModeType@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setUiModeNight' mangled-name='AConfiguration_setUiModeNight' filepath='frameworks/base/native/android/configuration.cpp' line='214' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setUiModeNight@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setScreenWidthDp' mangled-name='AConfiguration_setScreenWidthDp' filepath='frameworks/base/native/android/configuration.cpp' line='220' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setScreenWidthDp@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setScreenHeightDp' mangled-name='AConfiguration_setScreenHeightDp' filepath='frameworks/base/native/android/configuration.cpp' line='224' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setScreenHeightDp@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setSmallestScreenWidthDp' mangled-name='AConfiguration_setSmallestScreenWidthDp' filepath='frameworks/base/native/android/configuration.cpp' line='228' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setSmallestScreenWidthDp@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_setLayoutDirection' mangled-name='AConfiguration_setLayoutDirection' filepath='frameworks/base/native/android/configuration.cpp' line='232' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_setLayoutDirection@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <parameter type-id='3ff5601b' name='mcc' filepath='frameworks/base/native/android/configuration.cpp' line='142' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_diff' mangled-name='AConfiguration_diff' filepath='frameworks/base/native/android/configuration.cpp' line='239' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_diff@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config1' filepath='frameworks/base/native/android/configuration.cpp' line='239' column='1'/>
>+      <parameter type-id='138c2704' name='config2' filepath='frameworks/base/native/android/configuration.cpp' line='239' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_match' mangled-name='AConfiguration_match' filepath='frameworks/base/native/android/configuration.cpp' line='243' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_match@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='config1' filepath='frameworks/base/native/android/configuration.cpp' line='239' column='1'/>
>+      <parameter type-id='138c2704' name='config2' filepath='frameworks/base/native/android/configuration.cpp' line='239' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AConfiguration_isBetterThan' mangled-name='AConfiguration_isBetterThan' filepath='frameworks/base/native/android/configuration.cpp' line='247' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AConfiguration_isBetterThan@@LIBANDROID'>
>+      <parameter type-id='138c2704' name='base' filepath='frameworks/base/native/android/configuration.cpp' line='247' column='1'/>
>+      <parameter type-id='138c2704' name='test' filepath='frameworks/base/native/android/configuration.cpp' line='247' column='1'/>
>+      <parameter type-id='138c2704' name='requested' filepath='frameworks/base/native/android/configuration.cpp' line='248' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/hardware_buffer_jni.cpp' language='LANG_C_plus_plus_14'>
>+    <typedef-decl name='AHardwareBuffer' type-id='4d45f31e' filepath='frameworks/native/libs/nativewindow/include/android/hardware_buffer.h' line='333' column='1' id='7a58eebd'/>
>     <pointer-type-def type-id='4d45f31e' size-in-bits='32' id='cdc60214'/>
>+    <function-decl name='AHardwareBuffer_fromHardwareBuffer' mangled-name='AHardwareBuffer_fromHardwareBuffer' filepath='frameworks/base/native/android/hardware_buffer_jni.cpp' line='25' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AHardwareBuffer_fromHardwareBuffer@@LIBANDROID'>
>+      <parameter type-id='fae49a1f' name='env' filepath='frameworks/base/native/android/hardware_buffer_jni.cpp' line='25' column='1'/>
>+      <parameter type-id='96f3d089' name='hardwareBufferObj' filepath='frameworks/base/native/android/hardware_buffer_jni.cpp' line='25' column='1'/>
>+      <return type-id='cdc60214'/>
>+    </function-decl>
>+    <function-decl name='AHardwareBuffer_toHardwareBuffer' mangled-name='AHardwareBuffer_toHardwareBuffer' filepath='frameworks/base/native/android/hardware_buffer_jni.cpp' line='29' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AHardwareBuffer_toHardwareBuffer@@LIBANDROID'>
>+      <parameter type-id='fae49a1f' name='env' filepath='frameworks/base/native/android/hardware_buffer_jni.cpp' line='29' column='1'/>
>+      <parameter type-id='cdc60214' name='hardwareBuffer' filepath='frameworks/base/native/android/hardware_buffer_jni.cpp' line='29' column='1'/>
>+      <return type-id='96f3d089'/>
>+    </function-decl>
>     <class-decl name='AHardwareBuffer' is-struct='yes' visibility='default' is-declaration-only='yes' id='4d45f31e'/>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/input.cpp' language='LANG_C_plus_plus_14'>
>+    <typedef-decl name='AInputEvent' type-id='80020150' filepath='frameworks/native/include/android/input.h' line='151' column='1' id='5c3d41cf'/>
>+    <typedef-decl name='AInputQueue' type-id='81665327' filepath='frameworks/native/include/android/input.h' line='1298' column='1' id='18581c08'/>
>+    <class-decl name='AInputQueue' size-in-bits='8' is-struct='yes' visibility='default' filepath='frameworks/base/core/jni/include/android_runtime/android_view_InputQueue.h' line='30' column='1' id='81665327'/>
>+    <typedef-decl name='ALooper' type-id='da89ab6d' filepath='frameworks/native/include/android/looper.h' line='47' column='1' id='b02ad8ee'/>
>+    <typedef-decl name='ALooper_callbackFunc' type-id='d08b57b3' filepath='frameworks/native/include/android/looper.h' line='168' column='1' id='0f66625a'/>
>+    <pointer-type-def type-id='5c3d41cf' size-in-bits='32' id='b7c0a646'/>
>+    <pointer-type-def type-id='b7c0a646' size-in-bits='32' id='b045fc04'/>
>+    <pointer-type-def type-id='18581c08' size-in-bits='32' id='dcca009f'/>
>+    <pointer-type-def type-id='b02ad8ee' size-in-bits='32' id='863667dd'/>
>     <pointer-type-def type-id='2a632eb8' size-in-bits='32' id='3fc367ce'/>
>+    <qualified-type-def type-id='5c3d41cf' const='yes' id='0aecdd5f'/>
>+    <pointer-type-def type-id='0aecdd5f' size-in-bits='32' id='a7e09f2f'/>
>     <qualified-type-def type-id='f4d8c12c' const='yes' id='ae051203'/>
>     <pointer-type-def type-id='ae051203' size-in-bits='32' id='1afb968b'/>
>     <qualified-type-def type-id='d608af4d' const='yes' id='ae11cd9e'/>
>@@ -18118,6 +18492,7 @@
>     <qualified-type-def type-id='1eb56b1e' const='yes' id='ca7c9639'/>
>     <reference-type-def kind='lvalue' type-id='ca7c9639' size-in-bits='32' id='e12052cd'/>
>     <pointer-type-def type-id='ca7c9639' size-in-bits='32' id='d5203fe9'/>
>+    <pointer-type-def type-id='073bc15f' size-in-bits='32' id='d08b57b3'/>
>     <namespace-decl name='android'>
>       <class-decl name='PointerProperties' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/native/include/input/Input.h' line='308' column='1' id='2a632eb8'>
>         <data-member access='public' layout-offset-in-bits='0'>
>@@ -18133,11 +18508,370 @@
>       <class-decl name='Vector&lt;long long&gt;' visibility='default' is-declaration-only='yes' id='2b389727'/>
>       <class-decl name='Vector&lt;android::PointerProperties&gt;' visibility='default' is-declaration-only='yes' id='dd52783e'/>
>     </namespace-decl>
>+    <function-decl name='AInputEvent_getType' mangled-name='AInputEvent_getType' filepath='frameworks/base/native/android/input.cpp' line='41' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputEvent_getType@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AInputEvent_getDeviceId' mangled-name='AInputEvent_getDeviceId' filepath='frameworks/base/native/android/input.cpp' line='45' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputEvent_getDeviceId@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AInputEvent_getSource' mangled-name='AInputEvent_getSource' filepath='frameworks/base/native/android/input.cpp' line='49' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputEvent_getSource@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getAction' mangled-name='AKeyEvent_getAction' filepath='frameworks/base/native/android/input.cpp' line='53' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getAction@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getFlags' mangled-name='AKeyEvent_getFlags' filepath='frameworks/base/native/android/input.cpp' line='57' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getFlags@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getKeyCode' mangled-name='AKeyEvent_getKeyCode' filepath='frameworks/base/native/android/input.cpp' line='61' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getKeyCode@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getScanCode' mangled-name='AKeyEvent_getScanCode' filepath='frameworks/base/native/android/input.cpp' line='65' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getScanCode@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getMetaState' mangled-name='AKeyEvent_getMetaState' filepath='frameworks/base/native/android/input.cpp' line='69' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getMetaState@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getRepeatCount' mangled-name='AKeyEvent_getRepeatCount' filepath='frameworks/base/native/android/input.cpp' line='72' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getRepeatCount@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getDownTime' mangled-name='AKeyEvent_getDownTime' filepath='frameworks/base/native/android/input.cpp' line='76' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getDownTime@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='key_event' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
>+      <return type-id='9da381c4'/>
>+    </function-decl>
>+    <function-decl name='AKeyEvent_getEventTime' mangled-name='AKeyEvent_getEventTime' filepath='frameworks/base/native/android/input.cpp' line='81' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getEventTime@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='key_event' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
>+      <return type-id='9da381c4'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getAction' mangled-name='AMotionEvent_getAction' filepath='frameworks/base/native/android/input.cpp' line='85' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getAction@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getFlags' mangled-name='AMotionEvent_getFlags' filepath='frameworks/base/native/android/input.cpp' line='89' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getFlags@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getMetaState' mangled-name='AMotionEvent_getMetaState' filepath='frameworks/base/native/android/input.cpp' line='93' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getMetaState@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getButtonState' mangled-name='AMotionEvent_getButtonState' filepath='frameworks/base/native/android/input.cpp' line='97' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getButtonState@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getEdgeFlags' mangled-name='AMotionEvent_getEdgeFlags' filepath='frameworks/base/native/android/input.cpp' line='101' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getEdgeFlags@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='event' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getDownTime' mangled-name='AMotionEvent_getDownTime' filepath='frameworks/base/native/android/input.cpp' line='105' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getDownTime@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='key_event' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
>+      <return type-id='9da381c4'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getEventTime' mangled-name='AMotionEvent_getEventTime' filepath='frameworks/base/native/android/input.cpp' line='109' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getEventTime@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='key_event' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
>+      <return type-id='9da381c4'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getXOffset' mangled-name='AMotionEvent_getXOffset' filepath='frameworks/base/native/android/input.cpp' line='113' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getXOffset@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='113' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getYOffset' mangled-name='AMotionEvent_getYOffset' filepath='frameworks/base/native/android/input.cpp' line='117' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getYOffset@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='113' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getXPrecision' mangled-name='AMotionEvent_getXPrecision' filepath='frameworks/base/native/android/input.cpp' line='121' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getXPrecision@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='113' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getYPrecision' mangled-name='AMotionEvent_getYPrecision' filepath='frameworks/base/native/android/input.cpp' line='125' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getYPrecision@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='113' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getPointerCount' mangled-name='AMotionEvent_getPointerCount' filepath='frameworks/base/native/android/input.cpp' line='129' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getPointerCount@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='129' column='1'/>
>+      <return type-id='b59d7dce'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getPointerId' mangled-name='AMotionEvent_getPointerId' filepath='frameworks/base/native/android/input.cpp' line='133' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getPointerId@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='133' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='133' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getToolType' mangled-name='AMotionEvent_getToolType' filepath='frameworks/base/native/android/input.cpp' line='137' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getToolType@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='133' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='133' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getRawX' mangled-name='AMotionEvent_getRawX' filepath='frameworks/base/native/android/input.cpp' line='141' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getRawX@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getRawY' mangled-name='AMotionEvent_getRawY' filepath='frameworks/base/native/android/input.cpp' line='145' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getRawY@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getX' mangled-name='AMotionEvent_getX' filepath='frameworks/base/native/android/input.cpp' line='149' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getX@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getY' mangled-name='AMotionEvent_getY' filepath='frameworks/base/native/android/input.cpp' line='153' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getY@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getPressure' mangled-name='AMotionEvent_getPressure' filepath='frameworks/base/native/android/input.cpp' line='157' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getPressure@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getSize' mangled-name='AMotionEvent_getSize' filepath='frameworks/base/native/android/input.cpp' line='161' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getSize@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getTouchMajor' mangled-name='AMotionEvent_getTouchMajor' filepath='frameworks/base/native/android/input.cpp' line='165' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getTouchMajor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getTouchMinor' mangled-name='AMotionEvent_getTouchMinor' filepath='frameworks/base/native/android/input.cpp' line='169' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getTouchMinor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getToolMajor' mangled-name='AMotionEvent_getToolMajor' filepath='frameworks/base/native/android/input.cpp' line='173' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getToolMajor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getToolMinor' mangled-name='AMotionEvent_getToolMinor' filepath='frameworks/base/native/android/input.cpp' line='177' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getToolMinor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getOrientation' mangled-name='AMotionEvent_getOrientation' filepath='frameworks/base/native/android/input.cpp' line='181' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getOrientation@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='141' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getAxisValue' mangled-name='AMotionEvent_getAxisValue' filepath='frameworks/base/native/android/input.cpp' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getAxisValue@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='185' column='1'/>
>+      <parameter type-id='3ff5601b' name='axis' filepath='frameworks/base/native/android/input.cpp' line='186' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='186' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistorySize' mangled-name='AMotionEvent_getHistorySize' filepath='frameworks/base/native/android/input.cpp' line='190' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistorySize@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='129' column='1'/>
>+      <return type-id='b59d7dce'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalEventTime' mangled-name='AMotionEvent_getHistoricalEventTime' filepath='frameworks/base/native/android/input.cpp' line='194' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalEventTime@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='194' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='195' column='1'/>
>+      <return type-id='9da381c4'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalRawX' mangled-name='AMotionEvent_getHistoricalRawX' filepath='frameworks/base/native/android/input.cpp' line='200' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalRawX@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalRawY' mangled-name='AMotionEvent_getHistoricalRawY' filepath='frameworks/base/native/android/input.cpp' line='206' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalRawY@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalX' mangled-name='AMotionEvent_getHistoricalX' filepath='frameworks/base/native/android/input.cpp' line='212' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalX@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalY' mangled-name='AMotionEvent_getHistoricalY' filepath='frameworks/base/native/android/input.cpp' line='218' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalY@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalPressure' mangled-name='AMotionEvent_getHistoricalPressure' filepath='frameworks/base/native/android/input.cpp' line='224' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalPressure@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalSize' mangled-name='AMotionEvent_getHistoricalSize' filepath='frameworks/base/native/android/input.cpp' line='230' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalSize@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalTouchMajor' mangled-name='AMotionEvent_getHistoricalTouchMajor' filepath='frameworks/base/native/android/input.cpp' line='236' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalTouchMajor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalTouchMinor' mangled-name='AMotionEvent_getHistoricalTouchMinor' filepath='frameworks/base/native/android/input.cpp' line='242' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalTouchMinor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalToolMajor' mangled-name='AMotionEvent_getHistoricalToolMajor' filepath='frameworks/base/native/android/input.cpp' line='248' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalToolMajor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalToolMinor' mangled-name='AMotionEvent_getHistoricalToolMinor' filepath='frameworks/base/native/android/input.cpp' line='254' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalToolMinor@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalOrientation' mangled-name='AMotionEvent_getHistoricalOrientation' filepath='frameworks/base/native/android/input.cpp' line='260' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalOrientation@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='200' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='201' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AMotionEvent_getHistoricalAxisValue' mangled-name='AMotionEvent_getHistoricalAxisValue' filepath='frameworks/base/native/android/input.cpp' line='266' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalAxisValue@@LIBANDROID'>
>+      <parameter type-id='a7e09f2f' name='motion_event' filepath='frameworks/base/native/android/input.cpp' line='266' column='1'/>
>+      <parameter type-id='3ff5601b' name='axis' filepath='frameworks/base/native/android/input.cpp' line='267' column='1'/>
>+      <parameter type-id='b59d7dce' name='pointer_index' filepath='frameworks/base/native/android/input.cpp' line='267' column='1'/>
>+      <parameter type-id='b59d7dce' name='history_index' filepath='frameworks/base/native/android/input.cpp' line='267' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='AInputQueue_attachLooper' mangled-name='AInputQueue_attachLooper' filepath='frameworks/base/native/android/input.cpp' line='273' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputQueue_attachLooper@@LIBANDROID'>
>+      <parameter type-id='dcca009f' name='queue' filepath='frameworks/base/native/android/input.cpp' line='273' column='1'/>
>+      <parameter type-id='863667dd' name='looper' filepath='frameworks/base/native/android/input.cpp' line='273' column='1'/>
>+      <parameter type-id='95e97e5e' name='ident' filepath='frameworks/base/native/android/input.cpp' line='274' column='1'/>
>+      <parameter type-id='0f66625a' name='callback' filepath='frameworks/base/native/android/input.cpp' line='274' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/input.cpp' line='274' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AInputQueue_detachLooper' mangled-name='AInputQueue_detachLooper' filepath='frameworks/base/native/android/input.cpp' line='280' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputQueue_detachLooper@@LIBANDROID'>
>+      <parameter type-id='dcca009f' name='queue' filepath='frameworks/base/native/android/input.cpp' line='280' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AInputQueue_hasEvents' mangled-name='AInputQueue_hasEvents' filepath='frameworks/base/native/android/input.cpp' line='285' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputQueue_hasEvents@@LIBANDROID'>
>+      <parameter type-id='dcca009f' name='queue' filepath='frameworks/base/native/android/input.cpp' line='285' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AInputQueue_getEvent' mangled-name='AInputQueue_getEvent' filepath='frameworks/base/native/android/input.cpp' line='290' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputQueue_getEvent@@LIBANDROID'>
>+      <parameter type-id='dcca009f' name='queue' filepath='frameworks/base/native/android/input.cpp' line='290' column='1'/>
>+      <parameter type-id='b045fc04' name='outEvent' filepath='frameworks/base/native/android/input.cpp' line='290' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AInputQueue_preDispatchEvent' mangled-name='AInputQueue_preDispatchEvent' filepath='frameworks/base/native/android/input.cpp' line='298' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputQueue_preDispatchEvent@@LIBANDROID'>
>+      <parameter type-id='dcca009f' name='queue' filepath='frameworks/base/native/android/input.cpp' line='298' column='1'/>
>+      <parameter type-id='b7c0a646' name='event' filepath='frameworks/base/native/android/input.cpp' line='298' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AInputQueue_finishEvent' mangled-name='AInputQueue_finishEvent' filepath='frameworks/base/native/android/input.cpp' line='304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AInputQueue_finishEvent@@LIBANDROID'>
>+      <parameter type-id='dcca009f' name='queue' filepath='frameworks/base/native/android/input.cpp' line='304' column='1'/>
>+      <parameter type-id='b7c0a646' name='event' filepath='frameworks/base/native/android/input.cpp' line='304' column='1'/>
>+      <parameter type-id='95e97e5e' name='handled' filepath='frameworks/base/native/android/input.cpp' line='304' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <class-decl name='AInputEvent' is-struct='yes' visibility='default' is-declaration-only='yes' id='80020150'/>
>+    <class-decl name='ALooper' is-struct='yes' visibility='default' is-declaration-only='yes' id='da89ab6d'/>
>+    <function-type size-in-bits='32' id='073bc15f'>
>+      <parameter type-id='95e97e5e'/>
>+      <parameter type-id='95e97e5e'/>
>+      <parameter type-id='eaa32e2f'/>
>+      <return type-id='95e97e5e'/>
>+    </function-type>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/looper.cpp' language='LANG_C_plus_plus_14'>
>+    <pointer-type-def type-id='eaa32e2f' size-in-bits='32' id='63e171df'/>
>+    <function-decl name='ALooper_forThread' mangled-name='ALooper_forThread' filepath='frameworks/base/native/android/looper.cpp' line='36' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_forThread@@LIBANDROID'>
>+      <return type-id='863667dd'/>
>+    </function-decl>
>+    <function-decl name='ALooper_prepare' mangled-name='ALooper_prepare' filepath='frameworks/base/native/android/looper.cpp' line='40' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_prepare@@LIBANDROID'>
>+      <parameter type-id='95e97e5e' name='opts' filepath='frameworks/base/native/android/looper.cpp' line='40' column='1'/>
>+      <return type-id='863667dd'/>
>+    </function-decl>
>+    <function-decl name='ALooper_acquire' mangled-name='ALooper_acquire' filepath='frameworks/base/native/android/looper.cpp' line='44' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_acquire@@LIBANDROID'>
>+      <parameter type-id='863667dd' name='looper' filepath='frameworks/base/native/android/looper.cpp' line='44' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ALooper_release' mangled-name='ALooper_release' filepath='frameworks/base/native/android/looper.cpp' line='48' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_release@@LIBANDROID'>
>+      <parameter type-id='863667dd' name='looper' filepath='frameworks/base/native/android/looper.cpp' line='44' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ALooper_pollOnce' mangled-name='ALooper_pollOnce' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_pollOnce@@LIBANDROID'>
>+      <parameter type-id='95e97e5e' name='timeoutMillis' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <parameter type-id='7292109c' name='outFd' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <parameter type-id='7292109c' name='outEvents' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <parameter type-id='63e171df' name='outData' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ALooper_pollAll' mangled-name='ALooper_pollAll' filepath='frameworks/base/native/android/looper.cpp' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_pollAll@@LIBANDROID'>
>+      <parameter type-id='95e97e5e' name='timeoutMillis' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <parameter type-id='7292109c' name='outFd' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <parameter type-id='7292109c' name='outEvents' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <parameter type-id='63e171df' name='outData' filepath='frameworks/base/native/android/looper.cpp' line='52' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ALooper_wake' mangled-name='ALooper_wake' filepath='frameworks/base/native/android/looper.cpp' line='74' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_wake@@LIBANDROID'>
>+      <parameter type-id='863667dd' name='looper' filepath='frameworks/base/native/android/looper.cpp' line='44' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ALooper_addFd' mangled-name='ALooper_addFd' filepath='frameworks/base/native/android/looper.cpp' line='78' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_addFd@@LIBANDROID'>
>+      <parameter type-id='863667dd' name='looper' filepath='frameworks/base/native/android/looper.cpp' line='78' column='1'/>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/looper.cpp' line='78' column='1'/>
>+      <parameter type-id='95e97e5e' name='ident' filepath='frameworks/base/native/android/looper.cpp' line='78' column='1'/>
>+      <parameter type-id='95e97e5e' name='events' filepath='frameworks/base/native/android/looper.cpp' line='78' column='1'/>
>+      <parameter type-id='0f66625a' name='callback' filepath='frameworks/base/native/android/looper.cpp' line='79' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/looper.cpp' line='79' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ALooper_removeFd' mangled-name='ALooper_removeFd' filepath='frameworks/base/native/android/looper.cpp' line='83' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ALooper_removeFd@@LIBANDROID'>
>+      <parameter type-id='863667dd' name='looper' filepath='frameworks/base/native/android/looper.cpp' line='83' column='1'/>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/looper.cpp' line='83' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/native_activity.cpp' language='LANG_C_plus_plus_14'>
>+    <typedef-decl name='ANativeActivity' type-id='67c862fe' filepath='frameworks/native/include/android/native_activity.h' line='119' column='1' id='1471d4b9'/>
>     <pointer-type-def type-id='67c862fe' size-in-bits='32' id='37fc1694'/>
>+    <function-decl name='ANativeActivity_finish' mangled-name='ANativeActivity_finish' filepath='frameworks/base/native/android/native_activity.cpp' line='24' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeActivity_finish@@LIBANDROID'>
>+      <parameter type-id='37fc1694'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ANativeActivity_setWindowFormat' mangled-name='ANativeActivity_setWindowFormat' filepath='frameworks/base/native/android/native_activity.cpp' line='28' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeActivity_setWindowFormat@@LIBANDROID'>
>+      <parameter type-id='37fc1694' name='activity' filepath='frameworks/base/native/android/native_activity.cpp' line='28' column='1'/>
>+      <parameter type-id='3ff5601b' name='format' filepath='frameworks/base/native/android/native_activity.cpp' line='28' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ANativeActivity_setWindowFlags' mangled-name='ANativeActivity_setWindowFlags' filepath='frameworks/base/native/android/native_activity.cpp' line='32' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeActivity_setWindowFlags@@LIBANDROID'>
>+      <parameter type-id='37fc1694' name='activity' filepath='frameworks/base/native/android/native_activity.cpp' line='32' column='1'/>
>+      <parameter type-id='8f92235e' name='addFlags' filepath='frameworks/base/native/android/native_activity.cpp' line='33' column='1'/>
>+      <parameter type-id='8f92235e' name='removeFlags' filepath='frameworks/base/native/android/native_activity.cpp' line='33' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ANativeActivity_showSoftInput' mangled-name='ANativeActivity_showSoftInput' filepath='frameworks/base/native/android/native_activity.cpp' line='37' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeActivity_showSoftInput@@LIBANDROID'>
>+      <parameter type-id='37fc1694' name='activity' filepath='frameworks/base/native/android/native_activity.cpp' line='37' column='1'/>
>+      <parameter type-id='8f92235e' name='flags' filepath='frameworks/base/native/android/native_activity.cpp' line='37' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ANativeActivity_hideSoftInput' mangled-name='ANativeActivity_hideSoftInput' filepath='frameworks/base/native/android/native_activity.cpp' line='41' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeActivity_hideSoftInput@@LIBANDROID'>
>+      <parameter type-id='37fc1694' name='activity' filepath='frameworks/base/native/android/native_activity.cpp' line='37' column='1'/>
>+      <parameter type-id='8f92235e' name='flags' filepath='frameworks/base/native/android/native_activity.cpp' line='37' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>     <class-decl name='ANativeActivity' is-struct='yes' visibility='default' is-declaration-only='yes' id='67c862fe'/>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/native_window_jni.cpp' language='LANG_C_plus_plus_14'>
>@@ -18278,6 +19012,7 @@
>     <typedef-decl name='uintptr_t' type-id='ee08aaf3' filepath='bionic/libc/include/stdint.h' line='71' column='1' id='e475ab95'/>
>     <typedef-decl name='__uintptr_t' type-id='f0981eeb' filepath='bionic/libc/include/stdint.h' line='55' column='1' id='ee08aaf3'/>
>     <typedef-decl name='native_handle_t' type-id='3181ea79' filepath='system/core/libcutils/include/cutils/native_handle.h' line='47' column='1' id='40cec2e5'/>
>+    <typedef-decl name='ANativeWindow' type-id='4d637dbf' filepath='frameworks/native/libs/nativewindow/include/android/native_window.h' line='86' column='1' id='739fb858'/>
>     <class-decl name='native_handle' size-in-bits='96' is-struct='yes' visibility='default' filepath='system/core/libcutils/include/cutils/native_handle.h' line='34' column='1' id='3181ea79'>
>       <data-member access='public' layout-offset-in-bits='0'>
>         <var-decl name='version' type-id='95e97e5e' visibility='default' filepath='system/core/libcutils/include/cutils/native_handle.h' line='36' column='1'/>
>@@ -18407,6 +19142,16 @@
>       <class-decl name='Surface' visibility='default' is-declaration-only='yes' id='7dd446db'/>
>       <class-decl name='ANativeObjectBase&lt;ANativeWindow, android::Surface, android::RefBase, android_native_base_t&gt;' visibility='default' is-declaration-only='yes' id='b9fc4dbd'/>
>     </namespace-decl>
>+    <function-decl name='ANativeWindow_fromSurface' mangled-name='ANativeWindow_fromSurface' filepath='frameworks/base/native/android/native_window_jni.cpp' line='30' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeWindow_fromSurface@@LIBANDROID'>
>+      <parameter type-id='fae49a1f' name='env' filepath='frameworks/base/native/android/native_window_jni.cpp' line='30' column='1'/>
>+      <parameter type-id='96f3d089' name='surface' filepath='frameworks/base/native/android/native_window_jni.cpp' line='30' column='1'/>
>+      <return type-id='96ae8d47'/>
>+    </function-decl>
>+    <function-decl name='ANativeWindow_toSurface' mangled-name='ANativeWindow_toSurface' filepath='frameworks/base/native/android/native_window_jni.cpp' line='38' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeWindow_toSurface@@LIBANDROID'>
>+      <parameter type-id='fae49a1f' name='env' filepath='frameworks/base/native/android/native_window_jni.cpp' line='38' column='1'/>
>+      <parameter type-id='96ae8d47' name='window' filepath='frameworks/base/native/android/native_window_jni.cpp' line='38' column='1'/>
>+      <return type-id='96f3d089'/>
>+    </function-decl>
>     <function-type size-in-bits='32' id='18a8f8ab'>
>       <parameter type-id='96ae8d47'/>
>       <parameter type-id='2326b805'/>
>@@ -18452,8 +19197,93 @@
>     </function-type>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/net.c' language='LANG_C99'>
>+    <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='112' id='f01a039e'>
>+      <subrange length='14' type-id='7ff19f0f' id='48882d96'/>
>+    </array-type-def>
>+    <typedef-decl name='net_handle_t' type-id='9c313c2d' filepath='frameworks/native/include/android/multinetwork.h' line='44' column='1' id='d42e41d5'/>
>+    <class-decl name='addrinfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='bionic/libc/include/netdb.h' line='110' column='1' id='9194f5e2'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='ai_flags' type-id='95e97e5e' visibility='default' filepath='bionic/libc/include/netdb.h' line='111' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='ai_family' type-id='95e97e5e' visibility='default' filepath='bionic/libc/include/netdb.h' line='112' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='64'>
>+        <var-decl name='ai_socktype' type-id='95e97e5e' visibility='default' filepath='bionic/libc/include/netdb.h' line='113' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='96'>
>+        <var-decl name='ai_protocol' type-id='95e97e5e' visibility='default' filepath='bionic/libc/include/netdb.h' line='114' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='128'>
>+        <var-decl name='ai_addrlen' type-id='6b2697b0' visibility='default' filepath='bionic/libc/include/netdb.h' line='115' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='160'>
>+        <var-decl name='ai_canonname' type-id='26a90f95' visibility='default' filepath='bionic/libc/include/netdb.h' line='116' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='192'>
>+        <var-decl name='ai_addr' type-id='5c0abad8' visibility='default' filepath='bionic/libc/include/netdb.h' line='117' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='224'>
>+        <var-decl name='ai_next' type-id='61e7b2c0' visibility='default' filepath='bionic/libc/include/netdb.h' line='118' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='socklen_t' type-id='83f97a0a' filepath='bionic/libc/include/sys/types.h' line='117' column='1' id='6b2697b0'/>
>+    <typedef-decl name='__socklen_t' type-id='3ff5601b' filepath='bionic/libc/include/sys/types.h' line='112' column='1' id='83f97a0a'/>
>+    <class-decl name='sockaddr' size-in-bits='128' is-struct='yes' visibility='default' filepath='bionic/libc/include/sys/socket.h' line='69' column='1' id='5221b18a'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='sa_family' type-id='376fda66' visibility='default' filepath='bionic/libc/include/sys/socket.h' line='70' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='16'>
>+        <var-decl name='sa_data' type-id='f01a039e' visibility='default' filepath='bionic/libc/include/sys/socket.h' line='71' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='sa_family_t' type-id='8efea9e5' filepath='bionic/libc/include/bits/sa_family_t.h' line='39' column='1' id='376fda66'/>
>+    <enum-decl name='ResNsendFlags' filepath='frameworks/native/include/android/multinetwork.h' line='122' column='1' id='75bf5bc9'>
>+      <underlying-type type-id='9cac1fee'/>
>+      <enumerator name='ANDROID_RESOLV_NO_RETRY' value='1'/>
>+      <enumerator name='ANDROID_RESOLV_NO_CACHE_STORE' value='2'/>
>+      <enumerator name='ANDROID_RESOLV_NO_CACHE_LOOKUP' value='4'/>
>+    </enum-decl>
>+    <pointer-type-def type-id='9194f5e2' size-in-bits='32' id='61e7b2c0'/>
>+    <pointer-type-def type-id='61e7b2c0' size-in-bits='32' id='09bea65e'/>
>+    <qualified-type-def type-id='9194f5e2' const='yes' id='afd35b5b'/>
>+    <pointer-type-def type-id='afd35b5b' size-in-bits='32' id='3ab8f2e3'/>
>     <pointer-type-def type-id='ea86de29' size-in-bits='32' id='354f7eb9'/>
>+    <pointer-type-def type-id='5221b18a' size-in-bits='32' id='5c0abad8'/>
>+    <pointer-type-def type-id='b96825af' size-in-bits='32' id='ae3e8ca6'/>
>     <pointer-type-def type-id='002ac4a6' size-in-bits='32' id='cf536864'/>
>+    <function-decl name='android_setsocknetwork' mangled-name='android_setsocknetwork' filepath='frameworks/base/native/android/net.c' line='45' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='android_setsocknetwork@@LIBANDROID'>
>+      <parameter type-id='d42e41d5' name='network' filepath='frameworks/base/native/android/net.c' line='45' column='1'/>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/net.c' line='45' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='android_setprocnetwork' mangled-name='android_setprocnetwork' filepath='frameworks/base/native/android/net.c' line='60' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='android_setprocnetwork@@LIBANDROID'>
>+      <parameter type-id='d42e41d5' name='network' filepath='frameworks/base/native/android/net.c' line='60' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='android_getaddrinfofornetwork' mangled-name='android_getaddrinfofornetwork' filepath='frameworks/base/native/android/net.c' line='75' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='android_getaddrinfofornetwork@@LIBANDROID'>
>+      <parameter type-id='d42e41d5' name='network' filepath='frameworks/base/native/android/net.c' line='75' column='1'/>
>+      <parameter type-id='80f4b756' name='node' filepath='frameworks/base/native/android/net.c' line='76' column='1'/>
>+      <parameter type-id='80f4b756' name='service' filepath='frameworks/base/native/android/net.c' line='76' column='1'/>
>+      <parameter type-id='3ab8f2e3' name='hints' filepath='frameworks/base/native/android/net.c' line='77' column='1'/>
>+      <parameter type-id='09bea65e' name='res' filepath='frameworks/base/native/android/net.c' line='77' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='android_res_nquery' mangled-name='android_res_nquery' filepath='frameworks/base/native/android/net.c' line='87' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='android_res_nquery@@LIBANDROID'>
>+      <parameter type-id='d42e41d5' name='network' filepath='frameworks/base/native/android/net.c' line='87' column='1'/>
>+      <parameter type-id='80f4b756' name='dname' filepath='frameworks/base/native/android/net.c' line='87' column='1'/>
>+      <parameter type-id='95e97e5e' name='ns_class' filepath='frameworks/base/native/android/net.c' line='88' column='1'/>
>+      <parameter type-id='95e97e5e' name='ns_type' filepath='frameworks/base/native/android/net.c' line='88' column='1'/>
>+      <parameter type-id='75bf5bc9' name='flags' filepath='frameworks/base/native/android/net.c' line='88' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='android_res_nresult' mangled-name='android_res_nresult' filepath='frameworks/base/native/android/net.c' line='97' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='android_res_nresult@@LIBANDROID'>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/net.c' line='97' column='1'/>
>+      <parameter type-id='7292109c' name='rcode' filepath='frameworks/base/native/android/net.c' line='97' column='1'/>
>+      <parameter type-id='ae3e8ca6' name='answer' filepath='frameworks/base/native/android/net.c' line='97' column='1'/>
>+      <parameter type-id='b59d7dce' name='anslen' filepath='frameworks/base/native/android/net.c' line='97' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>     <function-decl name='resNetworkResult' filepath='system/netd/include/NetdClient.h' line='55' column='1' visibility='default' binding='global' size-in-bits='32'>
>       <parameter type-id='95e97e5e'/>
>       <parameter type-id='7292109c'/>
>@@ -18461,6 +19291,13 @@
>       <parameter type-id='f0981eeb'/>
>       <return type-id='95e97e5e'/>
>     </function-decl>
>+    <function-decl name='android_res_nsend' mangled-name='android_res_nsend' filepath='frameworks/base/native/android/net.c' line='101' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='android_res_nsend@@LIBANDROID'>
>+      <parameter type-id='d42e41d5' name='network' filepath='frameworks/base/native/android/net.c' line='101' column='1'/>
>+      <parameter type-id='9f7200cf' name='msg' filepath='frameworks/base/native/android/net.c' line='101' column='1'/>
>+      <parameter type-id='b59d7dce' name='msglen' filepath='frameworks/base/native/android/net.c' line='101' column='1'/>
>+      <parameter type-id='75bf5bc9' name='flags' filepath='frameworks/base/native/android/net.c' line='102' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>     <function-decl name='resNetworkSend' filepath='system/netd/include/NetdClient.h' line='57' column='1' visibility='default' binding='global' size-in-bits='32'>
>       <parameter type-id='f0981eeb'/>
>       <parameter type-id='354f7eb9'/>
>@@ -18468,6 +19305,10 @@
>       <parameter type-id='f0981eeb'/>
>       <return type-id='95e97e5e'/>
>     </function-decl>
>+    <function-decl name='android_res_cancel' mangled-name='android_res_cancel' filepath='frameworks/base/native/android/net.c' line='111' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='android_res_cancel@@LIBANDROID'>
>+      <parameter type-id='95e97e5e' name='nsend_fd' filepath='frameworks/base/native/android/net.c' line='111' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>     <function-decl name='resNetworkCancel' filepath='system/netd/include/NetdClient.h' line='59' column='1' visibility='default' binding='global' size-in-bits='32'>
>       <parameter type-id='95e97e5e'/>
>       <return type-id='48b5725f'/>
>@@ -18477,18 +19318,337 @@
>     <class-decl name='AObbInfo' size-in-bits='288' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/obb.cpp' line='26' column='1' id='3e61dcc9'>
>       <base-class access='public' layout-offset-in-bits='0' type-id='c02827ab'/>
>     </class-decl>
>+    <typedef-decl name='AObbInfo' type-id='3e61dcc9' filepath='frameworks/native/include/android/obb.h' line='37' column='1' id='0b958588'/>
>+    <pointer-type-def type-id='0b958588' size-in-bits='32' id='24159e91'/>
>     <qualified-type-def type-id='c02827ab' const='yes' id='0095643e'/>
>     <pointer-type-def type-id='0095643e' size-in-bits='32' id='ff2c8b7c'/>
>     <namespace-decl name='android'>
>       <class-decl name='ObbFile' visibility='default' is-declaration-only='yes' id='c02827ab'/>
>     </namespace-decl>
>+    <function-decl name='AObbScanner_getObbInfo' mangled-name='AObbScanner_getObbInfo' filepath='frameworks/base/native/android/obb.cpp' line='28' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AObbScanner_getObbInfo@@LIBANDROID'>
>+      <parameter type-id='80f4b756' name='filename' filepath='frameworks/base/native/android/obb.cpp' line='28' column='1'/>
>+      <return type-id='24159e91'/>
>+    </function-decl>
>+    <function-decl name='AObbInfo_delete' mangled-name='AObbInfo_delete' filepath='frameworks/base/native/android/obb.cpp' line='38' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AObbInfo_delete@@LIBANDROID'>
>+      <parameter type-id='24159e91' name='obbInfo' filepath='frameworks/base/native/android/obb.cpp' line='38' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AObbInfo_getPackageName' mangled-name='AObbInfo_getPackageName' filepath='frameworks/base/native/android/obb.cpp' line='44' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AObbInfo_getPackageName@@LIBANDROID'>
>+      <parameter type-id='24159e91' name='obbInfo' filepath='frameworks/base/native/android/obb.cpp' line='44' column='1'/>
>+      <return type-id='80f4b756'/>
>+    </function-decl>
>+    <function-decl name='AObbInfo_getVersion' mangled-name='AObbInfo_getVersion' filepath='frameworks/base/native/android/obb.cpp' line='48' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AObbInfo_getVersion@@LIBANDROID'>
>+      <parameter type-id='24159e91' name='obbInfo' filepath='frameworks/base/native/android/obb.cpp' line='48' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>+    <function-decl name='AObbInfo_getFlags' mangled-name='AObbInfo_getFlags' filepath='frameworks/base/native/android/obb.cpp' line='52' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AObbInfo_getFlags@@LIBANDROID'>
>+      <parameter type-id='24159e91' name='obbInfo' filepath='frameworks/base/native/android/obb.cpp' line='48' column='1'/>
>+      <return type-id='3ff5601b'/>
>+    </function-decl>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/sensor.cpp' language='LANG_C_plus_plus_14'>
>+    <array-type-def dimensions='1' type-id='a6c45d85' size-in-bits='448' id='7722ba46'>
>+      <subrange length='14' type-id='7ff19f0f' id='48882d96'/>
>+    </array-type-def>
>+    <array-type-def dimensions='1' type-id='a6c45d85' size-in-bits='512' id='73273128'>
>+      <subrange length='16' type-id='7ff19f0f' id='848d0938'/>
>+    </array-type-def>
>+    <array-type-def dimensions='1' type-id='a6c45d85' size-in-bits='96' id='c723f882'>
>+      <subrange length='3' type-id='7ff19f0f' id='56f209d2'/>
>+    </array-type-def>
>+    <array-type-def dimensions='1' type-id='3ff5601b' size-in-bits='448' id='75a6af5f'>
>+      <subrange length='14' type-id='7ff19f0f' id='48882d96'/>
>+    </array-type-def>
>+    <array-type-def dimensions='1' type-id='3ff5601b' size-in-bits='96' id='e86b43ed'>
>+      <subrange length='3' type-id='7ff19f0f' id='56f209d2'/>
>+    </array-type-def>
>+    <array-type-def dimensions='1' type-id='9c313c2d' size-in-bits='512' id='c5d13f42'>
>+      <subrange length='8' type-id='7ff19f0f' id='56e0c0b1'/>
>+    </array-type-def>
>+    <array-type-def dimensions='1' type-id='b96825af' size-in-bits='24' id='d3490169'>
>+      <subrange length='3' type-id='7ff19f0f' id='56f209d2'/>
>+    </array-type-def>
>+    <typedef-decl name='ASensorManager' type-id='85c2b5e1' filepath='frameworks/native/include/android/sensor.h' line='480' column='1' id='de193dd8'/>
>+    <class-decl name='ASensorManager' size-in-bits='8' is-struct='yes' visibility='default' filepath='frameworks/native/libs/sensor/include/sensor/SensorManager.h' line='39' column='1' id='85c2b5e1'/>
>+    <typedef-decl name='ASensorList' type-id='fffe71bc' filepath='frameworks/native/include/android/sensor.h' line='537' column='1' id='310273a5'/>
>+    <typedef-decl name='ASensorRef' type-id='a76cf719' filepath='frameworks/native/include/android/sensor.h' line='531' column='1' id='d818aa2e'/>
>+    <typedef-decl name='ASensor' type-id='68510cba' filepath='frameworks/native/include/android/sensor.h' line='525' column='1' id='a01f4379'/>
>+    <class-decl name='ASensor' size-in-bits='8' is-struct='yes' visibility='default' filepath='frameworks/native/libs/sensor/include/sensor/Sensor.h' line='34' column='1' id='68510cba'/>
>+    <typedef-decl name='ASensorEventQueue' type-id='e7195b11' filepath='frameworks/native/include/android/sensor.h' line='500' column='1' id='ee156a12'/>
>+    <class-decl name='ASensorEventQueue' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/native/libs/sensor/include/sensor/SensorEventQueue.h' line='35' column='1' id='e7195b11'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='looper' type-id='863667dd' visibility='default' filepath='frameworks/native/libs/sensor/include/sensor/SensorEventQueue.h' line='36' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='requestAdditionalInfo' type-id='c894953d' visibility='default' filepath='frameworks/native/libs/sensor/include/sensor/SensorEventQueue.h' line='37' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='ASensorEvent' type-id='38b55796' filepath='frameworks/native/include/android/sensor.h' line='461' column='1' id='d3154b53'/>
>+    <class-decl name='ASensorEvent' size-in-bits='832' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='429' column='1' id='38b55796'>
>+      <member-type access='public'>
>+        <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='435' column='1' id='3c5aed6e'>
>+          <member-type access='private'>
>+            <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='436' column='1' id='bec64d54'>
>+              <data-member access='private'>
>+                <var-decl name='data' type-id='73273128' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='437' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='vector' type-id='48a1b186' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='438' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='acceleration' type-id='48a1b186' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='439' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='magnetic' type-id='48a1b186' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='440' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='temperature' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='441' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='distance' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='442' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='light' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='443' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='pressure' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='444' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='relative_humidity' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='445' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='uncalibrated_gyro' type-id='f1b274b1' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='446' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='uncalibrated_magnetic' type-id='f1b274b1' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='447' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='meta_data' type-id='e3dd54c6' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='448' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='heart_rate' type-id='a4ce2d4d' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='449' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='dynamic_sensor_meta' type-id='22cf32ce' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='450' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='additional_info' type-id='1f241bc2' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='451' column='1'/>
>+              </data-member>
>+            </union-decl>
>+          </member-type>
>+          <member-type access='private'>
>+            <union-decl name='__anonymous_union__1' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='453' column='1' id='0469bf9d'>
>+              <data-member access='private'>
>+                <var-decl name='data' type-id='c5d13f42' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='454' column='1'/>
>+              </data-member>
>+              <data-member access='private'>
>+                <var-decl name='step_counter' type-id='9c313c2d' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='455' column='1'/>
>+              </data-member>
>+            </union-decl>
>+          </member-type>
>+          <data-member access='private'>
>+            <var-decl name='' type-id='bec64d54' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='436' column='1'/>
>+          </data-member>
>+          <data-member access='private'>
>+            <var-decl name='u64' type-id='0469bf9d' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='456' column='1'/>
>+          </data-member>
>+        </union-decl>
>+      </member-type>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='version' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='430' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='sensor' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='431' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='64'>
>+        <var-decl name='type' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='432' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='96'>
>+        <var-decl name='reserved0' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='433' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='128'>
>+        <var-decl name='timestamp' type-id='9da381c4' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='434' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='192'>
>+        <var-decl name='' type-id='3c5aed6e' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='435' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='704'>
>+        <var-decl name='flags' type-id='8f92235e' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='459' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='736'>
>+        <var-decl name='reserved1' type-id='e86b43ed' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='460' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='ASensorVector' type-id='b6b8bef1' filepath='frameworks/native/include/android/sensor.h' line='383' column='1' id='48a1b186'/>
>+    <class-decl name='ASensorVector' size-in-bits='128' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='367' column='1' id='b6b8bef1'>
>+      <member-type access='public'>
>+        <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='368' column='1' id='c1159a44'>
>+          <member-type access='private'>
>+            <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='370' column='1' id='5adeda19'>
>+              <data-member access='public' layout-offset-in-bits='0'>
>+                <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='371' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='32'>
>+                <var-decl name='y' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='372' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='64'>
>+                <var-decl name='z' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='373' column='1'/>
>+              </data-member>
>+            </class-decl>
>+          </member-type>
>+          <member-type access='private'>
>+            <class-decl name='__anonymous_struct__1' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='375' column='1' id='dbe1315f'>
>+              <data-member access='public' layout-offset-in-bits='0'>
>+                <var-decl name='azimuth' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='376' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='32'>
>+                <var-decl name='pitch' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='377' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='64'>
>+                <var-decl name='roll' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='378' column='1'/>
>+              </data-member>
>+            </class-decl>
>+          </member-type>
>+          <data-member access='private'>
>+            <var-decl name='v' type-id='c723f882' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='369' column='1'/>
>+          </data-member>
>+          <data-member access='private'>
>+            <var-decl name='' type-id='5adeda19' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='370' column='1'/>
>+          </data-member>
>+          <data-member access='private'>
>+            <var-decl name='' type-id='dbe1315f' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='375' column='1'/>
>+          </data-member>
>+        </union-decl>
>+      </member-type>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='' type-id='c1159a44' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='368' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='96'>
>+        <var-decl name='status' type-id='ee31ee44' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='381' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='104'>
>+        <var-decl name='reserved' type-id='d3490169' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='382' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='AUncalibratedEvent' type-id='225d4590' filepath='frameworks/native/include/android/sensor.h' line='407' column='1' id='f1b274b1'/>
>+    <class-decl name='AUncalibratedEvent' size-in-bits='192' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='390' column='1' id='225d4590'>
>+      <member-type access='public'>
>+        <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='391' column='1' id='1dbf3ff8'>
>+          <member-type access='private'>
>+            <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='393' column='1' id='b3670dd6'>
>+              <data-member access='public' layout-offset-in-bits='0'>
>+                <var-decl name='x_uncalib' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='394' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='32'>
>+                <var-decl name='y_uncalib' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='395' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='64'>
>+                <var-decl name='z_uncalib' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='396' column='1'/>
>+              </data-member>
>+            </class-decl>
>+          </member-type>
>+          <data-member access='private'>
>+            <var-decl name='uncalib' type-id='c723f882' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='392' column='1'/>
>+          </data-member>
>+          <data-member access='private'>
>+            <var-decl name='' type-id='b3670dd6' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='393' column='1'/>
>+          </data-member>
>+        </union-decl>
>+      </member-type>
>+      <member-type access='public'>
>+        <union-decl name='__anonymous_union__1' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='399' column='1' id='ac04569c'>
>+          <member-type access='private'>
>+            <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='401' column='1' id='f5acbf13'>
>+              <data-member access='public' layout-offset-in-bits='0'>
>+                <var-decl name='x_bias' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='402' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='32'>
>+                <var-decl name='y_bias' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='403' column='1'/>
>+              </data-member>
>+              <data-member access='public' layout-offset-in-bits='64'>
>+                <var-decl name='z_bias' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='404' column='1'/>
>+              </data-member>
>+            </class-decl>
>+          </member-type>
>+          <data-member access='private'>
>+            <var-decl name='bias' type-id='c723f882' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='400' column='1'/>
>+          </data-member>
>+          <data-member access='private'>
>+            <var-decl name='' type-id='f5acbf13' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='401' column='1'/>
>+          </data-member>
>+        </union-decl>
>+      </member-type>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='' type-id='1dbf3ff8' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='391' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='96'>
>+        <var-decl name='' type-id='ac04569c' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='399' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='AMetaDataEvent' type-id='6de4236b' filepath='frameworks/native/include/android/sensor.h' line='388' column='1' id='e3dd54c6'/>
>+    <class-decl name='AMetaDataEvent' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='385' column='1' id='6de4236b'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='what' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='386' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='sensor' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='387' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='AHeartRateEvent' type-id='14a24fe6' filepath='frameworks/native/include/android/sensor.h' line='412' column='1' id='a4ce2d4d'/>
>+    <class-decl name='AHeartRateEvent' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='409' column='1' id='14a24fe6'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='bpm' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='410' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='status' type-id='ee31ee44' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='411' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='ADynamicSensorEvent' type-id='984bb689' filepath='frameworks/native/include/android/sensor.h' line='417' column='1' id='22cf32ce'/>
>+    <class-decl name='ADynamicSensorEvent' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='414' column='1' id='984bb689'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='connected' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='415' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='handle' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='416' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <typedef-decl name='AAdditionalInfoEvent' type-id='fa893a23' filepath='frameworks/native/include/android/sensor.h' line='426' column='1' id='1f241bc2'/>
>+    <class-decl name='AAdditionalInfoEvent' size-in-bits='512' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='419' column='1' id='fa893a23'>
>+      <member-type access='public'>
>+        <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='422' column='1' id='225a17a3'>
>+          <data-member access='private'>
>+            <var-decl name='data_int32' type-id='75a6af5f' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='423' column='1'/>
>+          </data-member>
>+          <data-member access='private'>
>+            <var-decl name='data_float' type-id='7722ba46' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='424' column='1'/>
>+          </data-member>
>+        </union-decl>
>+      </member-type>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='type' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='420' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='serial' type-id='3ff5601b' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='421' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='64'>
>+        <var-decl name='' type-id='225a17a3' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='422' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <pointer-type-def type-id='d3154b53' size-in-bits='32' id='cc80875c'/>
>+    <pointer-type-def type-id='ee156a12' size-in-bits='32' id='d6d13e99'/>
>+    <pointer-type-def type-id='310273a5' size-in-bits='32' id='66f5f39c'/>
>+    <pointer-type-def type-id='de193dd8' size-in-bits='32' id='5e281929'/>
>     <reference-type-def kind='lvalue' type-id='3ebd995d' size-in-bits='32' id='ce4b3039'/>
>     <pointer-type-def type-id='3ebd995d' size-in-bits='32' id='da4b431d'/>
>     <reference-type-def kind='lvalue' type-id='c9173ef1' size-in-bits='32' id='be4d238d'/>
>     <reference-type-def kind='rvalue' type-id='c9173ef1' size-in-bits='32' id='3e6f2631'/>
>     <pointer-type-def type-id='c9173ef1' size-in-bits='32' id='b24d10a9'/>
>+    <qualified-type-def type-id='7a58eebd' const='yes' id='0eede28d'/>
>+    <pointer-type-def type-id='0eede28d' size-in-bits='32' id='277bcce5'/>
>+    <qualified-type-def type-id='a01f4379' const='yes' id='10d84009'/>
>+    <pointer-type-def type-id='10d84009' size-in-bits='32' id='a76cf719'/>
>+    <qualified-type-def type-id='d818aa2e' const='yes' id='cfd4ccfe'/>
>+    <pointer-type-def type-id='cfd4ccfe' size-in-bits='32' id='fffe71bc'/>
>     <qualified-type-def type-id='c9173ef1' const='yes' id='9876c7f8'/>
>     <reference-type-def kind='lvalue' type-id='9876c7f8' size-in-bits='32' id='e0fca27a'/>
>     <pointer-type-def type-id='9876c7f8' size-in-bits='32' id='d4fc8f96'/>
>@@ -18533,6 +19693,157 @@
>       </class-decl>
>       <class-decl name='SensorEventQueue' visibility='default' is-declaration-only='yes' id='3ebd995d'/>
>     </namespace-decl>
>+    <function-decl name='ASensorManager_getInstance' mangled-name='ASensorManager_getInstance' filepath='frameworks/base/native/android/sensor.cpp' line='64' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_getInstance@@LIBANDROID'>
>+      <return type-id='5e281929'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_getInstanceForPackage' mangled-name='ASensorManager_getInstanceForPackage' filepath='frameworks/base/native/android/sensor.cpp' line='68' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_getInstanceForPackage@@LIBANDROID'>
>+      <parameter type-id='80f4b756' name='packageName' filepath='frameworks/base/native/android/sensor.cpp' line='68' column='1'/>
>+      <return type-id='5e281929'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_getSensorList' mangled-name='ASensorManager_getSensorList' filepath='frameworks/base/native/android/sensor.cpp' line='76' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_getSensorList@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='76' column='1'/>
>+      <parameter type-id='66f5f39c' name='list' filepath='frameworks/base/native/android/sensor.cpp' line='76' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_getDefaultSensor' mangled-name='ASensorManager_getDefaultSensor' filepath='frameworks/base/native/android/sensor.cpp' line='86' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_getDefaultSensor@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='86' column='1'/>
>+      <parameter type-id='95e97e5e' name='type' filepath='frameworks/base/native/android/sensor.cpp' line='86' column='1'/>
>+      <return type-id='a76cf719'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_getDefaultSensorEx' mangled-name='ASensorManager_getDefaultSensorEx' filepath='frameworks/base/native/android/sensor.cpp' line='91' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_getDefaultSensorEx@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='91' column='1'/>
>+      <parameter type-id='95e97e5e' name='type' filepath='frameworks/base/native/android/sensor.cpp' line='91' column='1'/>
>+      <parameter type-id='c894953d' name='wakeUp' filepath='frameworks/base/native/android/sensor.cpp' line='91' column='1'/>
>+      <return type-id='a76cf719'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getType' mangled-name='ASensor_getType' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getType@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensor_isWakeUpSensor' mangled-name='ASensor_isWakeUpSensor' filepath='frameworks/base/native/android/sensor.cpp' line='340' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_isWakeUpSensor@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='340' column='1'/>
>+      <return type-id='c894953d'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_createEventQueue' mangled-name='ASensorManager_createEventQueue' filepath='frameworks/base/native/android/sensor.cpp' line='104' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_createEventQueue@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='104' column='1'/>
>+      <parameter type-id='863667dd' name='looper' filepath='frameworks/base/native/android/sensor.cpp' line='105' column='1'/>
>+      <parameter type-id='95e97e5e' name='ident' filepath='frameworks/base/native/android/sensor.cpp' line='105' column='1'/>
>+      <parameter type-id='0f66625a' name='callback' filepath='frameworks/base/native/android/sensor.cpp' line='105' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/sensor.cpp' line='105' column='1'/>
>+      <return type-id='d6d13e99'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_destroyEventQueue' mangled-name='ASensorManager_destroyEventQueue' filepath='frameworks/base/native/android/sensor.cpp' line='124' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_destroyEventQueue@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='124' column='1'/>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='124' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_createSharedMemoryDirectChannel' mangled-name='ASensorManager_createSharedMemoryDirectChannel' filepath='frameworks/base/native/android/sensor.cpp' line='134' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_createSharedMemoryDirectChannel@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='134' column='1'/>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/sensor.cpp' line='134' column='1'/>
>+      <parameter type-id='b59d7dce' name='size' filepath='frameworks/base/native/android/sensor.cpp' line='134' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_createHardwareBufferDirectChannel' mangled-name='ASensorManager_createHardwareBufferDirectChannel' filepath='frameworks/base/native/android/sensor.cpp' line='159' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_createHardwareBufferDirectChannel@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='160' column='1'/>
>+      <parameter type-id='277bcce5' name='buffer' filepath='frameworks/base/native/android/sensor.cpp' line='160' column='1'/>
>+      <parameter type-id='b59d7dce' name='size' filepath='frameworks/base/native/android/sensor.cpp' line='160' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_destroyDirectChannel' mangled-name='ASensorManager_destroyDirectChannel' filepath='frameworks/base/native/android/sensor.cpp' line='182' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_destroyDirectChannel@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='182' column='1'/>
>+      <parameter type-id='95e97e5e' name='channelId' filepath='frameworks/base/native/android/sensor.cpp' line='182' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='ASensorManager_configureDirectReport' mangled-name='ASensorManager_configureDirectReport' filepath='frameworks/base/native/android/sensor.cpp' line='188' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorManager_configureDirectReport@@LIBANDROID'>
>+      <parameter type-id='5e281929' name='manager' filepath='frameworks/base/native/android/sensor.cpp' line='189' column='1'/>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='189' column='1'/>
>+      <parameter type-id='95e97e5e' name='channelId' filepath='frameworks/base/native/android/sensor.cpp' line='189' column='1'/>
>+      <parameter type-id='95e97e5e' name='rate' filepath='frameworks/base/native/android/sensor.cpp' line='189' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorEventQueue_registerSensor' mangled-name='ASensorEventQueue_registerSensor' filepath='frameworks/base/native/android/sensor.cpp' line='209' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorEventQueue_registerSensor@@LIBANDROID'>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='209' column='1'/>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='209' column='1'/>
>+      <parameter type-id='3ff5601b' name='samplingPeriodUs' filepath='frameworks/base/native/android/sensor.cpp' line='210' column='1'/>
>+      <parameter type-id='9da381c4' name='maxBatchReportLatencyUs' filepath='frameworks/base/native/android/sensor.cpp' line='210' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorEventQueue_enableSensor' mangled-name='ASensorEventQueue_enableSensor' filepath='frameworks/base/native/android/sensor.cpp' line='223' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorEventQueue_enableSensor@@LIBANDROID'>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='223' column='1'/>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='223' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorEventQueue_disableSensor' mangled-name='ASensorEventQueue_disableSensor' filepath='frameworks/base/native/android/sensor.cpp' line='231' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorEventQueue_disableSensor@@LIBANDROID'>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='223' column='1'/>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='223' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorEventQueue_setEventRate' mangled-name='ASensorEventQueue_setEventRate' filepath='frameworks/base/native/android/sensor.cpp' line='239' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorEventQueue_setEventRate@@LIBANDROID'>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='239' column='1'/>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='239' column='1'/>
>+      <parameter type-id='3ff5601b' name='usec' filepath='frameworks/base/native/android/sensor.cpp' line='239' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorEventQueue_hasEvents' mangled-name='ASensorEventQueue_hasEvents' filepath='frameworks/base/native/android/sensor.cpp' line='252' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorEventQueue_hasEvents@@LIBANDROID'>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='252' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensorEventQueue_getEvents' mangled-name='ASensorEventQueue_getEvents' filepath='frameworks/base/native/android/sensor.cpp' line='271' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorEventQueue_getEvents@@LIBANDROID'>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='271' column='1'/>
>+      <parameter type-id='cc80875c' name='events' filepath='frameworks/base/native/android/sensor.cpp' line='271' column='1'/>
>+      <parameter type-id='b59d7dce' name='count' filepath='frameworks/base/native/android/sensor.cpp' line='271' column='1'/>
>+      <return type-id='79a0948f'/>
>+    </function-decl>
>+    <function-decl name='ASensorEventQueue_requestAdditionalInfoEvents' mangled-name='ASensorEventQueue_requestAdditionalInfoEvents' filepath='frameworks/base/native/android/sensor.cpp' line='287' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensorEventQueue_requestAdditionalInfoEvents@@LIBANDROID'>
>+      <parameter type-id='d6d13e99' name='queue' filepath='frameworks/base/native/android/sensor.cpp' line='287' column='1'/>
>+      <parameter type-id='c894953d' name='enable' filepath='frameworks/base/native/android/sensor.cpp' line='287' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getName' mangled-name='ASensor_getName' filepath='frameworks/base/native/android/sensor.cpp' line='295' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getName@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='295' column='1'/>
>+      <return type-id='80f4b756'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getVendor' mangled-name='ASensor_getVendor' filepath='frameworks/base/native/android/sensor.cpp' line='300' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getVendor@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='295' column='1'/>
>+      <return type-id='80f4b756'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getResolution' mangled-name='ASensor_getResolution' filepath='frameworks/base/native/android/sensor.cpp' line='310' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getResolution@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='310' column='1'/>
>+      <return type-id='a6c45d85'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getMinDelay' mangled-name='ASensor_getMinDelay' filepath='frameworks/base/native/android/sensor.cpp' line='315' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getMinDelay@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getFifoMaxEventCount' mangled-name='ASensor_getFifoMaxEventCount' filepath='frameworks/base/native/android/sensor.cpp' line='320' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getFifoMaxEventCount@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getFifoReservedEventCount' mangled-name='ASensor_getFifoReservedEventCount' filepath='frameworks/base/native/android/sensor.cpp' line='325' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getFifoReservedEventCount@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getStringType' mangled-name='ASensor_getStringType' filepath='frameworks/base/native/android/sensor.cpp' line='330' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getStringType@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='295' column='1'/>
>+      <return type-id='80f4b756'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getReportingMode' mangled-name='ASensor_getReportingMode' filepath='frameworks/base/native/android/sensor.cpp' line='335' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getReportingMode@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensor_isDirectChannelTypeSupported' mangled-name='ASensor_isDirectChannelTypeSupported' filepath='frameworks/base/native/android/sensor.cpp' line='345' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_isDirectChannelTypeSupported@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='345' column='1'/>
>+      <parameter type-id='95e97e5e' name='channelType' filepath='frameworks/base/native/android/sensor.cpp' line='345' column='1'/>
>+      <return type-id='c894953d'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getHighestDirectReportRateLevel' mangled-name='ASensor_getHighestDirectReportRateLevel' filepath='frameworks/base/native/android/sensor.cpp' line='350' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getHighestDirectReportRateLevel@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASensor_getHandle' mangled-name='ASensor_getHandle' filepath='frameworks/base/native/android/sensor.cpp' line='355' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASensor_getHandle@@LIBANDROID'>
>+      <parameter type-id='a76cf719' name='sensor' filepath='frameworks/base/native/android/sensor.cpp' line='305' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>   </abi-instr>
>   <abi-instr address-size='32' path='frameworks/base/native/android/sharedmem.cpp' language='LANG_C_plus_plus_14'>
>     <class-decl name='__anonymous_struct__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='frameworks/base/native/android/sharedmem.cpp' line='37' column='1' id='cdd897ae'>
>@@ -18609,6 +19920,7 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>+        <class-decl name='__tuple_indices&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='c527ef4d'/>
>         <class-decl name='__tuple_impl&lt;std::__1::__tuple_indices&lt;0, 1&gt;, (lambda at frameworks/base/native/android/sharedmem.cpp:37:37) &amp;&amp;, _JNIEnv *&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='external/libcxx/include/tuple' line='365' column='1' id='0e01d3be'>
>           <base-class access='public' layout-offset-in-bits='0' type-id='049c4c7d'/>
>           <base-class access='public' layout-offset-in-bits='32' type-id='4c49bdbb'/>
>@@ -18731,22 +20043,40 @@
>           </member-function>
>         </class-decl>
>         <class-decl name='__tuple_indices&lt;1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='4eb8548a'/>
>-        <class-decl name='__tuple_indices&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='c527ef4d'/>
>         <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='13623784'/>
>       </namespace-decl>
>     </namespace-decl>
>+    <function-decl name='ASharedMemory_create' mangled-name='ASharedMemory_create' filepath='frameworks/base/native/android/sharedmem.cpp' line='49' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASharedMemory_create@@LIBANDROID'>
>+      <parameter type-id='80f4b756'/>
>+      <parameter type-id='b59d7dce'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>     <function-decl name='ashmem_create_region' filepath='system/core/libcutils/include/cutils/ashmem.h' line='30' column='1' visibility='default' binding='global' size-in-bits='32'>
>       <parameter type-id='80f4b756'/>
>       <parameter type-id='f0981eeb'/>
>       <return type-id='95e97e5e'/>
>     </function-decl>
>+    <function-decl name='ASharedMemory_getSize' mangled-name='ASharedMemory_getSize' filepath='frameworks/base/native/android/sharedmem.cpp' line='56' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASharedMemory_getSize@@LIBANDROID'>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/sharedmem.cpp' line='56' column='1'/>
>+      <return type-id='b59d7dce'/>
>+    </function-decl>
>     <function-decl name='ashmem_get_size_region' filepath='system/core/libcutils/include/cutils/ashmem.h' line='34' column='1' visibility='default' binding='global' size-in-bits='32'>
>       <parameter type-id='95e97e5e'/>
>       <return type-id='95e97e5e'/>
>     </function-decl>
>+    <function-decl name='ASharedMemory_setProt' mangled-name='ASharedMemory_setProt' filepath='frameworks/base/native/android/sharedmem.cpp' line='60' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASharedMemory_setProt@@LIBANDROID'>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/sharedmem.cpp' line='60' column='1'/>
>+      <parameter type-id='95e97e5e' name='prot' filepath='frameworks/base/native/android/sharedmem.cpp' line='60' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>     <function-decl name='ashmem_set_prot_region' filepath='system/core/libcutils/include/cutils/ashmem.h' line='31' column='1' visibility='default' binding='global' size-in-bits='32'>
>-      <parameter type-id='95e97e5e'/>
>-      <parameter type-id='95e97e5e'/>
>+      <parameter type-id='95e97e5e' name='fd' filepath='frameworks/base/native/android/sharedmem.cpp' line='60' column='1'/>
>+      <parameter type-id='95e97e5e' name='prot' filepath='frameworks/base/native/android/sharedmem.cpp' line='60' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='ASharedMemory_dupFromJava' mangled-name='ASharedMemory_dupFromJava' filepath='frameworks/base/native/android/sharedmem.cpp' line='64' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASharedMemory_dupFromJava@@LIBANDROID'>
>+      <parameter type-id='fae49a1f' name='env' filepath='frameworks/base/native/android/sharedmem.cpp' line='64' column='1'/>
>+      <parameter type-id='96f3d089' name='javaSharedMemory' filepath='frameworks/base/native/android/sharedmem.cpp' line='64' column='1'/>
>       <return type-id='95e97e5e'/>
>     </function-decl>
>   </abi-instr>
>@@ -19897,6 +21227,39 @@
>         </class-decl>
>       </namespace-decl>
>     </namespace-decl>
>+    <function-decl name='AStorageManager_new' mangled-name='AStorageManager_new' filepath='frameworks/base/native/android/storage_manager.cpp' line='193' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AStorageManager_new@@LIBANDROID'>
>+      <return type-id='df7f8372'/>
>+    </function-decl>
>+    <function-decl name='AStorageManager_delete' mangled-name='AStorageManager_delete' filepath='frameworks/base/native/android/storage_manager.cpp' line='202' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AStorageManager_delete@@LIBANDROID'>
>+      <parameter type-id='df7f8372' name='mgr' filepath='frameworks/base/native/android/storage_manager.cpp' line='202' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AStorageManager_mountObb' mangled-name='AStorageManager_mountObb' filepath='frameworks/base/native/android/storage_manager.cpp' line='208' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AStorageManager_mountObb@@LIBANDROID'>
>+      <parameter type-id='df7f8372' name='mgr' filepath='frameworks/base/native/android/storage_manager.cpp' line='208' column='1'/>
>+      <parameter type-id='80f4b756' name='filename' filepath='frameworks/base/native/android/storage_manager.cpp' line='208' column='1'/>
>+      <parameter type-id='80f4b756' name='key' filepath='frameworks/base/native/android/storage_manager.cpp' line='208' column='1'/>
>+      <parameter type-id='9299e4b4' name='cb' filepath='frameworks/base/native/android/storage_manager.cpp' line='209' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/storage_manager.cpp' line='209' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AStorageManager_unmountObb' mangled-name='AStorageManager_unmountObb' filepath='frameworks/base/native/android/storage_manager.cpp' line='213' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AStorageManager_unmountObb@@LIBANDROID'>
>+      <parameter type-id='df7f8372' name='mgr' filepath='frameworks/base/native/android/storage_manager.cpp' line='213' column='1'/>
>+      <parameter type-id='80f4b756' name='filename' filepath='frameworks/base/native/android/storage_manager.cpp' line='213' column='1'/>
>+      <parameter type-id='2448a865' name='force' filepath='frameworks/base/native/android/storage_manager.cpp' line='213' column='1'/>
>+      <parameter type-id='9299e4b4' name='cb' filepath='frameworks/base/native/android/storage_manager.cpp' line='214' column='1'/>
>+      <parameter type-id='eaa32e2f' name='data' filepath='frameworks/base/native/android/storage_manager.cpp' line='214' column='1'/>
>+      <return type-id='48b5725f'/>
>+    </function-decl>
>+    <function-decl name='AStorageManager_isObbMounted' mangled-name='AStorageManager_isObbMounted' filepath='frameworks/base/native/android/storage_manager.cpp' line='218' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AStorageManager_isObbMounted@@LIBANDROID'>
>+      <parameter type-id='df7f8372' name='mgr' filepath='frameworks/base/native/android/storage_manager.cpp' line='218' column='1'/>
>+      <parameter type-id='80f4b756' name='filename' filepath='frameworks/base/native/android/storage_manager.cpp' line='218' column='1'/>
>+      <return type-id='95e97e5e'/>
>+    </function-decl>
>+    <function-decl name='AStorageManager_getMountedObbPath' mangled-name='AStorageManager_getMountedObbPath' filepath='frameworks/base/native/android/storage_manager.cpp' line='222' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AStorageManager_getMountedObbPath@@LIBANDROID'>
>+      <parameter type-id='df7f8372' name='mgr' filepath='frameworks/base/native/android/storage_manager.cpp' line='222' column='1'/>
>+      <parameter type-id='80f4b756' name='filename' filepath='frameworks/base/native/android/storage_manager.cpp' line='222' column='1'/>
>+      <return type-id='80f4b756'/>
>+    </function-decl>
>     <function-type size-in-bits='32' id='735b63b3'>
>       <parameter type-id='b5e7b678'/>
>       <parameter type-id='b5e7b678'/>
>@@ -19919,7 +21282,28 @@
>     <array-type-def dimensions='1' type-id='0ac54e8c' size-in-bits='512' id='0b1b1d03'>
>       <subrange length='4' type-id='7ff19f0f' id='16fe7105'/>
>     </array-type-def>
>-    <typedef-decl name='ARect' type-id='c9ee9172' filepath='frameworks/native/libs/arect/include/android/rect.h' line='57' column='1' id='d6dabff9'/>
>+    <typedef-decl name='ASurfaceTransaction' type-id='62e73201' filepath='frameworks/native/include/android/surface_control.h' line='86' column='1' id='7705ff5e'/>
>+    <typedef-decl name='ASurfaceTransaction_OnComplete' type-id='c4e02a75' filepath='frameworks/native/include/android/surface_control.h' line='137' column='1' id='f2816675'/>
>+    <typedef-decl name='ASurfaceTransactionStats' type-id='57f0cd10' filepath='frameworks/native/include/android/surface_control.h' line='119' column='1' id='d8cb99c5'/>
>+    <class-decl name='ASurfaceTransactionStats' size-in-bits='320' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='201' column='1' id='57f0cd10'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='aSurfaceControlStats' type-id='3e74d082' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='202' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='192'>
>+        <var-decl name='latchTime' type-id='9da381c4' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='203' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='256'>
>+        <var-decl name='presentFence' type-id='f783287d' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='204' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <class-decl name='ASurfaceControlStats' size-in-bits='128' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='196' column='1' id='5d04a8c3'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='acquireTime' type-id='9da381c4' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='197' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='64'>
>+        <var-decl name='previousReleaseFence' type-id='f783287d' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='198' column='1'/>
>+      </data-member>
>+    </class-decl>
>     <class-decl name='ARect' size-in-bits='128' is-struct='yes' visibility='default' filepath='frameworks/native/libs/arect/include/android/rect.h' line='45' column='1' id='c9ee9172'>
>       <data-member access='public' layout-offset-in-bits='0'>
>         <var-decl name='left' type-id='3ff5601b' visibility='default' filepath='frameworks/native/libs/arect/include/android/rect.h' line='50' column='1'/>
>@@ -19934,6 +21318,7 @@
>         <var-decl name='bottom' type-id='3ff5601b' visibility='default' filepath='frameworks/native/libs/arect/include/android/rect.h' line='56' column='1'/>
>       </data-member>
>     </class-decl>
>+    <typedef-decl name='ARect' type-id='c9ee9172' filepath='frameworks/native/libs/arect/include/android/rect.h' line='57' column='1' id='d6dabff9'/>
>     <class-decl name='android_smpte2086_metadata' size-in-bits='320' is-struct='yes' visibility='default' filepath='system/core/libsystem/include/system/graphics.h' line='250' column='1' id='ba8bd8c0'>
>       <data-member access='public' layout-offset-in-bits='0'>
>         <var-decl name='displayPrimaryRed' type-id='0095f3ea' visibility='default' filepath='system/core/libsystem/include/system/graphics.h' line='251' column='1'/>
>@@ -19975,14 +21360,6 @@
>     <typedef-decl name='__uid_t' type-id='70734f24' filepath='bionic/libc/include/sys/types.h' line='44' column='1' id='cc5fcceb'/>
>     <typedef-decl name='__kernel_uid32_t' type-id='f0981eeb' filepath='bionic/libc/kernel/uapi/asm-generic/posix_types.h' line='49' column='1' id='70734f24'/>
>     <typedef-decl name='weakref_type' type-id='114d3ce2' filepath='system/core/libutils/include/utils/RefBase.h' line='364' column='1' id='4b9d3492'/>
>-    <class-decl name='ASurfaceControlStats' size-in-bits='128' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='196' column='1' id='5d04a8c3'>
>-      <data-member access='public' layout-offset-in-bits='0'>
>-        <var-decl name='acquireTime' type-id='9da381c4' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='197' column='1'/>
>-      </data-member>
>-      <data-member access='public' layout-offset-in-bits='64'>
>-        <var-decl name='previousReleaseFence' type-id='f783287d' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='198' column='1'/>
>-      </data-member>
>-    </class-decl>
>     <class-decl name='__anonymous_struct__' size-in-bits='32' is-anonymous='yes' naming-typedef-id='0be802d8' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='282' column='1' id='2de51dab'>
>       <data-member access='private' layout-offset-in-bits='0'>
>         <var-decl name='func' type-id='f2816675' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='282' column='1'/>
>@@ -19998,22 +21375,60 @@
>         </function-decl>
>       </member-function>
>     </class-decl>
>-    <typedef-decl name='ASurfaceTransaction_OnComplete' type-id='c4e02a75' filepath='frameworks/native/include/android/surface_control.h' line='137' column='1' id='f2816675'/>
>-    <typedef-decl name='ASurfaceTransactionStats' type-id='57f0cd10' filepath='frameworks/native/include/android/surface_control.h' line='119' column='1' id='d8cb99c5'/>
>-    <class-decl name='ASurfaceTransactionStats' size-in-bits='320' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='201' column='1' id='57f0cd10'>
>+    <typedef-decl name='ASurfaceControl' type-id='7df76490' filepath='frameworks/native/include/android/surface_control.h' line='47' column='1' id='8f5a19d7'/>
>+    <enum-decl name='ADataSpace' filepath='frameworks/native/libs/nativewindow/include/android/data_space.h' line='33' column='1' id='baaa46b7'>
>+      <underlying-type type-id='9cac1fee'/>
>+      <enumerator name='ADATASPACE_UNKNOWN' value='0'/>
>+      <enumerator name='ADATASPACE_SCRGB_LINEAR' value='406913024'/>
>+      <enumerator name='ADATASPACE_SRGB' value='142671872'/>
>+      <enumerator name='ADATASPACE_SCRGB' value='411107328'/>
>+      <enumerator name='ADATASPACE_DISPLAY_P3' value='143261696'/>
>+      <enumerator name='ADATASPACE_BT2020_PQ' value='163971072'/>
>+    </enum-decl>
>+    <class-decl name='AHdrMetadata_smpte2086' size-in-bits='320' is-struct='yes' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='55' column='1' id='1a4a01cf'>
>       <data-member access='public' layout-offset-in-bits='0'>
>-        <var-decl name='aSurfaceControlStats' type-id='3e74d082' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='202' column='1'/>
>+        <var-decl name='displayPrimaryRed' type-id='0f6f574f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='56' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='64'>
>+        <var-decl name='displayPrimaryGreen' type-id='0f6f574f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='57' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='128'>
>+        <var-decl name='displayPrimaryBlue' type-id='0f6f574f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='58' column='1'/>
>       </data-member>
>       <data-member access='public' layout-offset-in-bits='192'>
>-        <var-decl name='latchTime' type-id='9da381c4' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='203' column='1'/>
>+        <var-decl name='whitePoint' type-id='0f6f574f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='59' column='1'/>
>       </data-member>
>       <data-member access='public' layout-offset-in-bits='256'>
>-        <var-decl name='presentFence' type-id='f783287d' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='204' column='1'/>
>+        <var-decl name='maxLuminance' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='60' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='288'>
>+        <var-decl name='minLuminance' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='61' column='1'/>
>       </data-member>
>     </class-decl>
>+    <class-decl name='AColor_xy' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='47' column='1' id='0f6f574f'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='48' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='y' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='49' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <class-decl name='AHdrMetadata_cta861_3' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='67' column='1' id='c58985b9'>
>+      <data-member access='public' layout-offset-in-bits='0'>
>+        <var-decl name='maxContentLightLevel' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='68' column='1'/>
>+      </data-member>
>+      <data-member access='public' layout-offset-in-bits='32'>
>+        <var-decl name='maxFrameAverageLightLevel' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/android/hdr_metadata.h' line='69' column='1'/>
>+      </data-member>
>+    </class-decl>
>+    <pointer-type-def type-id='c58985b9' size-in-bits='32' id='9680af21'/>
>+    <pointer-type-def type-id='1a4a01cf' size-in-bits='32' id='e13b5c87'/>
>     <pointer-type-def type-id='7df76490' size-in-bits='32' id='0373e656'/>
>     <qualified-type-def type-id='0373e656' const='yes' id='f8a9b7c9'/>
>     <reference-type-def kind='lvalue' type-id='f8a9b7c9' size-in-bits='32' id='622c8d3d'/>
>+    <pointer-type-def type-id='0373e656' size-in-bits='32' id='eb73d534'/>
>+    <pointer-type-def type-id='eb73d534' size-in-bits='32' id='c5587e3a'/>
>+    <pointer-type-def type-id='7705ff5e' size-in-bits='32' id='97b42359'/>
>     <pointer-type-def type-id='d8cb99c5' size-in-bits='32' id='b98edb26'/>
>     <pointer-type-def type-id='d684da9f' size-in-bits='32' id='3d8087e7'/>
>     <reference-type-def kind='lvalue' type-id='3af595a3' size-in-bits='32' id='8b9865b7'/>
>@@ -20163,6 +21578,9 @@
>     <pointer-type-def type-id='9af0438f' size-in-bits='32' id='ed491f06'/>
>     <reference-type-def kind='lvalue' type-id='c894953d' size-in-bits='32' id='dce6b981'/>
>     <pointer-type-def type-id='c894953d' size-in-bits='32' id='d8e6b335'/>
>+    <qualified-type-def type-id='d6dabff9' const='yes' id='2a561b69'/>
>+    <reference-type-def kind='lvalue' type-id='2a561b69' size-in-bits='32' id='f48cfd5d'/>
>+    <pointer-type-def type-id='2a561b69' size-in-bits='32' id='e88cea79'/>
>     <reference-type-def kind='lvalue' type-id='a585bdd7' size-in-bits='32' id='828a0263'/>
>     <qualified-type-def type-id='ea557d9a' const='yes' id='9d9262fb'/>
>     <pointer-type-def type-id='9d9262fb' size-in-bits='32' id='de718f03'/>
>@@ -22063,7 +23481,6 @@
>     <reference-type-def kind='rvalue' type-id='b4e634f0' size-in-bits='32' id='60fee6a9'/>
>     <pointer-type-def type-id='b4e634f0' size-in-bits='32' id='ff9692c1'/>
>     <pointer-type-def type-id='9c313c2d' size-in-bits='32' id='5d6479ae'/>
>-    <pointer-type-def type-id='b96825af' size-in-bits='32' id='ae3e8ca6'/>
>     <pointer-type-def type-id='e475ab95' size-in-bits='32' id='fc3d9c6c'/>
>     <qualified-type-def type-id='cf536864' const='yes' id='b0327aaf'/>
>     <reference-type-def kind='lvalue' type-id='b0327aaf' size-in-bits='32' id='e876e5ab'/>
>@@ -22076,6 +23493,126 @@
>     <pointer-type-def type-id='84653d39' size-in-bits='32' id='7e5f24e9'/>
>     <pointer-type-def type-id='4b9d3492' size-in-bits='32' id='7613b793'/>
>     <namespace-decl name='android'>
>+      <class-decl name='sp&lt;android::Fence&gt;' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/StrongPointer.h' line='31' column='1' id='f783287d'>
>+        <data-member access='private' layout-offset-in-bits='0'>
>+          <var-decl name='m_ptr' type-id='97b48b31' visibility='default' filepath='system/core/libutils/include/utils/StrongPointer.h' line='90' column='1'/>
>+        </data-member>
>+        <member-function access='public'>
>+          <function-decl name='sp' mangled-name='_ZN7android2spINS_5FenceEEC2Ev' filepath='system/core/libutils/include/utils/StrongPointer.h' line='33' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='e1c103ed' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public'>
>+          <function-decl name='sp' mangled-name='_ZN7android2spINS_5FenceEEC2EPS1_' filepath='system/core/libutils/include/utils/StrongPointer.h' line='41' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='e1c103ed' is-artificial='yes'/>
>+            <parameter type-id='97b48b31'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public'>
>+          <function-decl name='sp' filepath='system/core/libutils/include/utils/StrongPointer.h' line='42' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='e1c103ed' is-artificial='yes'/>
>+            <parameter type-id='bac2bb80'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public'>
>+          <function-decl name='sp' filepath='system/core/libutils/include/utils/StrongPointer.h' line='43' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='e1c103ed' is-artificial='yes'/>
>+            <parameter type-id='adbbacfd'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' destructor='yes'>
>+          <function-decl name='~sp' mangled-name='_ZN7android2spINS_5FenceEED2Ev' filepath='system/core/libutils/include/utils/StrongPointer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='e1c103ed' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>+      <class-decl name='Fence' size-in-bits='64' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='35' column='1' id='8e900ba9'>
>+        <base-class access='public' layout-offset-in-bits='0' type-id='fa133b32'/>
>+        <base-class access='public' layout-offset-in-bits='0' type-id='214e7574'/>
>+        <member-type access='private'>
>+          <enum-decl name='Status' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='114' column='1' id='19b87c56'>
>+            <underlying-type type-id='9cac1fee'/>
>+            <enumerator name='Invalid' value='0'/>
>+            <enumerator name='Unsignaled' value='1'/>
>+            <enumerator name='Signaled' value='2'/>
>+          </enum-decl>
>+        </member-type>
>+        <data-member access='public' static='yes'>
>+          <var-decl name='NO_FENCE' type-id='8fb586a6' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='39' column='1'/>
>+        </data-member>
>+        <data-member access='public' static='yes'>
>+          <var-decl name='SIGNAL_TIME_PENDING' type-id='1e3bd547' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='40' column='1'/>
>+        </data-member>
>+        <data-member access='public' static='yes'>
>+          <var-decl name='SIGNAL_TIME_INVALID' type-id='1e3bd547' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='41' column='1'/>
>+        </data-member>
>+        <data-member access='private' layout-offset-in-bits='32'>
>+          <var-decl name='mFenceFd' type-id='ca770154' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='149' column='1'/>
>+        </data-member>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='53' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='97b48b31' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='58' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='97b48b31' is-artificial='yes'/>
>+            <parameter type-id='95e97e5e'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='59' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='97b48b31' is-artificial='yes'/>
>+            <parameter type-id='ca770154'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='62' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='97b48b31' is-artificial='yes'/>
>+            <parameter type-id='44db3f5e'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='64' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='97b48b31' is-artificial='yes'/>
>+            <parameter type-id='482cfef9'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='private' destructor='yes'>
>+          <function-decl name='~Fence' mangled-name='_ZN7android5FenceD2Ev' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='147' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='97b48b31' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>+      <class-decl name='LightRefBase&lt;android::Fence&gt;' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/LightRefBase.h' line='32' column='1' id='fa133b32'>
>+        <data-member access='private' layout-offset-in-bits='0'>
>+          <var-decl name='mCount' type-id='673b29cf' visibility='default' filepath='system/core/libutils/include/utils/LightRefBase.h' line='59' column='1'/>
>+        </data-member>
>+        <member-function access='public'>
>+          <function-decl name='LightRefBase' filepath='system/core/libutils/include/utils/LightRefBase.h' line='35' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='aafa1350' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='protected' destructor='yes'>
>+          <function-decl name='~LightRefBase' filepath='system/core/libutils/include/utils/LightRefBase.h' line='51' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='aafa1350' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>+      <class-decl name='Flattenable&lt;android::Fence&gt;' size-in-bits='8' visibility='default' filepath='system/core/libutils/include/utils/Flattenable.h' line='102' column='1' id='214e7574'/>
>       <class-decl name='Parcelable' size-in-bits='32' visibility='default' filepath='frameworks/native/libs/binder/include/binder/Parcelable.h' line='35' column='1' id='f8f7e309'>
>         <member-function access='public' constructor='yes'>
>           <function-decl name='Parcelable' mangled-name='_ZN7android10ParcelableC2Ev' filepath='frameworks/native/libs/binder/include/binder/Parcelable.h' line='39' column='1' visibility='default' binding='global' size-in-bits='32'>
>@@ -22242,6 +23779,62 @@
>           </function-decl>
>         </member-function>
>       </class-decl>
>+      <class-decl name='Rect' size-in-bits='128' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='33' column='1' id='c071b10e'>
>+        <base-class access='public' layout-offset-in-bits='0' type-id='c9ee9172'/>
>+        <base-class access='public' layout-offset-in-bits='0' type-id='0222005a'/>
>+        <data-member access='public' static='yes'>
>+          <var-decl name='INVALID_RECT' type-id='63da15ad' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='38' column='1'/>
>+        </data-member>
>+        <data-member access='public' static='yes'>
>+          <var-decl name='EMPTY_RECT' type-id='63da15ad' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='39' column='1'/>
>+        </data-member>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Rect' mangled-name='_ZN7android4RectC2Ev' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='44' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='9874ac24' is-artificial='yes'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='59' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='9874ac24' is-artificial='yes'/>
>+            <parameter type-id='3ff5601b'/>
>+            <parameter type-id='3ff5601b'/>
>+            <parameter type-id='3ff5601b'/>
>+            <parameter type-id='3ff5601b'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='66' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='9874ac24' is-artificial='yes'/>
>+            <parameter type-id='beff857f'/>
>+            <parameter type-id='beff857f'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='73' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='9874ac24' is-artificial='yes'/>
>+            <parameter type-id='08e3e9b5'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public' constructor='yes'>
>+          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='82' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='9874ac24' is-artificial='yes'/>
>+            <parameter type-id='de22882a'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+        <member-function access='public'>
>+          <function-decl name='Rect&lt;unsigned int&gt;' mangled-name='_ZN7android4RectC2IjEET_S2_' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='47' column='1' visibility='default' binding='global' size-in-bits='32'>
>+            <parameter type-id='9874ac24' is-artificial='yes'/>
>+            <parameter type-id='f0981eeb'/>
>+            <parameter type-id='f0981eeb'/>
>+            <return type-id='48b5725f'/>
>+          </function-decl>
>+        </member-function>
>+      </class-decl>
>       <class-decl name='sp&lt;android::SurfaceComposerClient&gt;' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/StrongPointer.h' line='31' column='1' id='2b730b78'>
>         <data-member access='private' layout-offset-in-bits='0'>
>           <var-decl name='m_ptr' type-id='69ef4324' visibility='default' filepath='system/core/libutils/include/utils/StrongPointer.h' line='90' column='1'/>
>@@ -22525,62 +24118,6 @@
>           </function-decl>
>         </member-function>
>       </class-decl>
>-      <class-decl name='Rect' size-in-bits='128' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='33' column='1' id='c071b10e'>
>-        <base-class access='public' layout-offset-in-bits='0' type-id='c9ee9172'/>
>-        <base-class access='public' layout-offset-in-bits='0' type-id='0222005a'/>
>-        <data-member access='public' static='yes'>
>-          <var-decl name='INVALID_RECT' type-id='63da15ad' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='38' column='1'/>
>-        </data-member>
>-        <data-member access='public' static='yes'>
>-          <var-decl name='EMPTY_RECT' type-id='63da15ad' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='39' column='1'/>
>-        </data-member>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Rect' mangled-name='_ZN7android4RectC2Ev' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='44' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='9874ac24' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='59' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='9874ac24' is-artificial='yes'/>
>-            <parameter type-id='3ff5601b'/>
>-            <parameter type-id='3ff5601b'/>
>-            <parameter type-id='3ff5601b'/>
>-            <parameter type-id='3ff5601b'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='66' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='9874ac24' is-artificial='yes'/>
>-            <parameter type-id='beff857f'/>
>-            <parameter type-id='beff857f'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='73' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='9874ac24' is-artificial='yes'/>
>-            <parameter type-id='08e3e9b5'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Rect' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='82' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='9874ac24' is-artificial='yes'/>
>-            <parameter type-id='de22882a'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public'>
>-          <function-decl name='Rect&lt;unsigned int&gt;' mangled-name='_ZN7android4RectC2IjEET_S2_' filepath='frameworks/native/libs/ui/include/ui/Rect.h' line='47' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='9874ac24' is-artificial='yes'/>
>-            <parameter type-id='f0981eeb'/>
>-            <parameter type-id='f0981eeb'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>       <class-decl name='LightFlattenablePod&lt;android::Rect&gt;' size-in-bits='8' visibility='default' filepath='system/core/libutils/include/utils/Flattenable.h' line='199' column='1' id='0222005a'>
>         <base-class access='public' layout-offset-in-bits='0' type-id='f2086b13'/>
>       </class-decl>
>@@ -22758,126 +24295,6 @@
>         </member-function>
>       </class-decl>
>       <class-decl name='LightFlattenable&lt;android::Region&gt;' size-in-bits='8' visibility='default' filepath='system/core/libutils/include/utils/Flattenable.h' line='156' column='1' id='99119b01'/>
>-      <class-decl name='sp&lt;android::Fence&gt;' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/StrongPointer.h' line='31' column='1' id='f783287d'>
>-        <data-member access='private' layout-offset-in-bits='0'>
>-          <var-decl name='m_ptr' type-id='97b48b31' visibility='default' filepath='system/core/libutils/include/utils/StrongPointer.h' line='90' column='1'/>
>-        </data-member>
>-        <member-function access='public'>
>-          <function-decl name='sp' mangled-name='_ZN7android2spINS_5FenceEEC2Ev' filepath='system/core/libutils/include/utils/StrongPointer.h' line='33' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='e1c103ed' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public'>
>-          <function-decl name='sp' mangled-name='_ZN7android2spINS_5FenceEEC2EPS1_' filepath='system/core/libutils/include/utils/StrongPointer.h' line='41' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='e1c103ed' is-artificial='yes'/>
>-            <parameter type-id='97b48b31'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public'>
>-          <function-decl name='sp' filepath='system/core/libutils/include/utils/StrongPointer.h' line='42' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='e1c103ed' is-artificial='yes'/>
>-            <parameter type-id='bac2bb80'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public'>
>-          <function-decl name='sp' filepath='system/core/libutils/include/utils/StrongPointer.h' line='43' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='e1c103ed' is-artificial='yes'/>
>-            <parameter type-id='adbbacfd'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' destructor='yes'>
>-          <function-decl name='~sp' mangled-name='_ZN7android2spINS_5FenceEED2Ev' filepath='system/core/libutils/include/utils/StrongPointer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='e1c103ed' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>-      <class-decl name='Fence' size-in-bits='64' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='35' column='1' id='8e900ba9'>
>-        <base-class access='public' layout-offset-in-bits='0' type-id='fa133b32'/>
>-        <base-class access='public' layout-offset-in-bits='0' type-id='214e7574'/>
>-        <member-type access='private'>
>-          <enum-decl name='Status' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='114' column='1' id='19b87c56'>
>-            <underlying-type type-id='9cac1fee'/>
>-            <enumerator name='Invalid' value='0'/>
>-            <enumerator name='Unsignaled' value='1'/>
>-            <enumerator name='Signaled' value='2'/>
>-          </enum-decl>
>-        </member-type>
>-        <data-member access='public' static='yes'>
>-          <var-decl name='NO_FENCE' type-id='8fb586a6' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='39' column='1'/>
>-        </data-member>
>-        <data-member access='public' static='yes'>
>-          <var-decl name='SIGNAL_TIME_PENDING' type-id='1e3bd547' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='40' column='1'/>
>-        </data-member>
>-        <data-member access='public' static='yes'>
>-          <var-decl name='SIGNAL_TIME_INVALID' type-id='1e3bd547' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='41' column='1'/>
>-        </data-member>
>-        <data-member access='private' layout-offset-in-bits='32'>
>-          <var-decl name='mFenceFd' type-id='ca770154' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='149' column='1'/>
>-        </data-member>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='53' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='97b48b31' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='58' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='97b48b31' is-artificial='yes'/>
>-            <parameter type-id='95e97e5e'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='59' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='97b48b31' is-artificial='yes'/>
>-            <parameter type-id='ca770154'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='62' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='97b48b31' is-artificial='yes'/>
>-            <parameter type-id='44db3f5e'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='public' constructor='yes'>
>-          <function-decl name='Fence' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='64' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='97b48b31' is-artificial='yes'/>
>-            <parameter type-id='482cfef9'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='private' destructor='yes'>
>-          <function-decl name='~Fence' mangled-name='_ZN7android5FenceD2Ev' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='147' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='97b48b31' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>-      <class-decl name='LightRefBase&lt;android::Fence&gt;' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/LightRefBase.h' line='32' column='1' id='fa133b32'>
>-        <data-member access='private' layout-offset-in-bits='0'>
>-          <var-decl name='mCount' type-id='673b29cf' visibility='default' filepath='system/core/libutils/include/utils/LightRefBase.h' line='59' column='1'/>
>-        </data-member>
>-        <member-function access='public'>
>-          <function-decl name='LightRefBase' filepath='system/core/libutils/include/utils/LightRefBase.h' line='35' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='aafa1350' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-        <member-function access='protected' destructor='yes'>
>-          <function-decl name='~LightRefBase' filepath='system/core/libutils/include/utils/LightRefBase.h' line='51' column='1' visibility='default' binding='global' size-in-bits='32'>
>-            <parameter type-id='aafa1350' is-artificial='yes'/>
>-            <return type-id='48b5725f'/>
>-          </function-decl>
>-        </member-function>
>-      </class-decl>
>-      <class-decl name='Flattenable&lt;android::Fence&gt;' size-in-bits='8' visibility='default' filepath='system/core/libutils/include/utils/Flattenable.h' line='102' column='1' id='214e7574'/>
>       <class-decl name='HdrMetadata' size-in-bits='512' is-struct='yes' visibility='default' filepath='frameworks/native/libs/gui/include/gui/HdrMetadata.h' line='27' column='1' id='6164fbd7'>
>         <base-class access='public' layout-offset-in-bits='0' type-id='5f1c4286'/>
>         <member-type access='public'>
>@@ -24129,7 +25546,7 @@
>           <member-type access='private'>
>             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='47' column='1' id='dd749bdc'>
>               <member-type access='private'>
>-                <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1' id='5adeda19'>
>+                <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1' id='5adeda1a'>
>                   <data-member access='public' layout-offset-in-bits='0'>
>                     <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1'/>
>                   </data-member>
>@@ -24168,7 +25585,7 @@
>                 </class-decl>
>               </member-type>
>               <data-member access='private'>
>-                <var-decl name='' type-id='5adeda19' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1'/>
>+                <var-decl name='' type-id='5adeda1a' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1'/>
>               </data-member>
>               <data-member access='private'>
>                 <var-decl name='' type-id='edac197f' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='49' column='1'/>
>@@ -24258,6 +25675,7 @@
>           </member-function>
>         </class-decl>
>       </namespace-decl>
>+      <class-decl name='ReferenceRenamer' visibility='default' is-declaration-only='yes' id='fe4eabab'/>
>       <class-decl name='SurfaceComposerClient' visibility='default' is-declaration-only='yes' id='7203e7be'>
>         <member-type access='private'>
>           <class-decl name='Transaction' size-in-bits='896' visibility='default' filepath='frameworks/native/libs/gui/include/gui/SurfaceComposerClient.h' line='288' column='1' id='88d5fc7e'>
>@@ -24365,7 +25783,6 @@
>           </enum-decl>
>         </member-type>
>       </class-decl>
>-      <class-decl name='ReferenceRenamer' visibility='default' is-declaration-only='yes' id='fe4eabab'/>
>       <class-decl name='IPCThreadState' visibility='default' is-declaration-only='yes' id='b5977877'/>
>       <class-decl name='flat_binder_object' is-struct='yes' visibility='default' is-declaration-only='yes' id='8fc19046'/>
>       <class-decl name='TextOutput' visibility='default' is-declaration-only='yes' id='32215dca'/>
>@@ -24377,465 +25794,474 @@
>     </namespace-decl>
>     <namespace-decl name='std'>
>       <namespace-decl name='__1'>
>-        <class-decl name='unordered_map&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState, android::SurfaceComposerClient::SCHash, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, std::__1::allocator&lt;std::__1::pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/unordered_map' line='842' column='1' id='b5996dd6'>
>+        <class-decl name='unordered_map&lt;ASurfaceControl *, ASurfaceControlStats, std::__1::hash&lt;ASurfaceControl *&gt;, std::__1::equal_to&lt;ASurfaceControl *&gt;, std::__1::allocator&lt;std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/unordered_map' line='842' column='1' id='3e74d082'>
>           <member-type access='private'>
>-            <typedef-decl name='__table' type-id='0fcd7eac' filepath='external/libcxx/include/unordered_map' line='866' column='1' id='7fcc176d'/>
>+            <typedef-decl name='__table' type-id='f8fe7006' filepath='external/libcxx/include/unordered_map' line='866' column='1' id='87d70925'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='5fb1fd5f' filepath='external/libcxx/include/unordered_map' line='885' column='1' id='39044a49'/>
>+            <typedef-decl name='size_type' type-id='58367bd7' filepath='external/libcxx/include/unordered_map' line='885' column='1' id='98af9011'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='hasher' type-id='52d5d590' filepath='external/libcxx/include/unordered_map' line='848' column='1' id='ea42aa52'/>
>+            <typedef-decl name='hasher' type-id='8f29ea84' filepath='external/libcxx/include/unordered_map' line='848' column='1' id='58febc8a'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='key_equal' type-id='3e463dcc' filepath='external/libcxx/include/unordered_map' line='849' column='1' id='512d62bb'/>
>+            <typedef-decl name='key_equal' type-id='8b407fd0' filepath='external/libcxx/include/unordered_map' line='849' column='1' id='96836bc3'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='c6fe9052' filepath='external/libcxx/include/unordered_map' line='850' column='1' id='3b4464f7'/>
>+            <typedef-decl name='allocator_type' type-id='e96ff388' filepath='external/libcxx/include/unordered_map' line='850' column='1' id='7809d74f'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='727a2ce7' filepath='external/libcxx/include/unordered_map' line='888' column='1' id='bb9a24f7'/>
>+            <typedef-decl name='iterator' type-id='296bd4f1' filepath='external/libcxx/include/unordered_map' line='888' column='1' id='fba4cc6f'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='7a4acb43' filepath='external/libcxx/include/unordered_map' line='889' column='1' id='7b9c8023'/>
>+            <typedef-decl name='const_iterator' type-id='c6ad08ed' filepath='external/libcxx/include/unordered_map' line='889' column='1' id='5ff55c2b'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='e0bee049' filepath='external/libcxx/include/unordered_map' line='851' column='1' id='c31d6a4f'/>
>+            <typedef-decl name='value_type' type-id='b9953957' filepath='external/libcxx/include/unordered_map' line='851' column='1' id='dd031057'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='key_type' type-id='3d05d53e' filepath='external/libcxx/include/unordered_map' line='846' column='1' id='9fbda7c9'/>
>+            <typedef-decl name='key_type' type-id='0373e656' filepath='external/libcxx/include/unordered_map' line='846' column='1' id='a7601001'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='insert_return_type' type-id='b14a07f8' filepath='external/libcxx/include/unordered_map' line='895' column='1' id='dc518940'/>
>+            <typedef-decl name='insert_return_type' type-id='17daebc4' filepath='external/libcxx/include/unordered_map' line='895' column='1' id='93435bd8'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='node_type' type-id='cd19729a' filepath='external/libcxx/include/unordered_map' line='894' column='1' id='397c0a7e'/>
>+            <typedef-decl name='node_type' type-id='82c88fb2' filepath='external/libcxx/include/unordered_map' line='894' column='1' id='397ebe86'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='mapped_type' type-id='d684da9f' filepath='external/libcxx/include/unordered_map' line='847' column='1' id='ade42637'/>
>+            <typedef-decl name='mapped_type' type-id='5d04a8c3' filepath='external/libcxx/include/unordered_map' line='847' column='1' id='e356f8cf'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='local_iterator' type-id='47d846d7' filepath='external/libcxx/include/unordered_map' line='890' column='1' id='15c05647'/>
>+            <typedef-decl name='local_iterator' type-id='cdb7bb81' filepath='external/libcxx/include/unordered_map' line='890' column='1' id='45de445f'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_local_iterator' type-id='c947f453' filepath='external/libcxx/include/unordered_map' line='891' column='1' id='a8995e13'/>
>+            <typedef-decl name='const_local_iterator' type-id='9acf275d' filepath='external/libcxx/include/unordered_map' line='891' column='1' id='2c30f23b'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__table_' type-id='7fcc176d' visibility='default' filepath='external/libcxx/include/unordered_map' line='868' column='1'/>
>+            <var-decl name='__table_' type-id='87d70925' visibility='default' filepath='external/libcxx/include/unordered_map' line='868' column='1'/>
>           </data-member>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' mangled-name='_ZNSt3__113unordered_mapIN7android2spINS1_14SurfaceControlEEENS1_13ComposerStateENS1_21SurfaceComposerClient6SCHashENS_8equal_toIS4_EENS_9allocatorINS_4pairIKS4_S5_EEEEEC2Ev' filepath='external/libcxx/include/unordered_map' line='904' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>+            <function-decl name='unordered_map' mangled-name='_ZNSt3__113unordered_mapIP15ASurfaceControl20ASurfaceControlStatsNS_4hashIS2_EENS_8equal_toIS2_EENS_9allocatorINS_4pairIKS2_S3_EEEEEC2Ev' filepath='external/libcxx/include/unordered_map' line='904' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='911' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='046291ac'/>
>-              <parameter type-id='db8e5857'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='b6a32cf4'/>
>+              <parameter type-id='94b3270f'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='913' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='046291ac'/>
>-              <parameter type-id='db8e5857'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='b6a32cf4'/>
>+              <parameter type-id='94b3270f'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='928' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='929' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='a2fe3a71'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='51baffd9'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='930' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='a2fe3a71'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='51baffd9'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='933' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='97fc736a'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='14ae5416'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='935' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='97fc736a'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='14ae5416'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='936' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='840c594b'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='f4e12a25'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='937' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='840c594b'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='046291ac'/>
>-              <parameter type-id='db8e5857'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='f4e12a25'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='b6a32cf4'/>
>+              <parameter type-id='94b3270f'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='939' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='840c594b'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='046291ac'/>
>-              <parameter type-id='db8e5857'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='f4e12a25'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='b6a32cf4'/>
>+              <parameter type-id='94b3270f'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='945' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='948' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='046291ac'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='b6a32cf4'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='960' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='840c594b'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='f4e12a25'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='963' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='571a02bc' is-artificial='yes'/>
>-              <parameter type-id='840c594b'/>
>-              <parameter type-id='39044a49'/>
>-              <parameter type-id='046291ac'/>
>-              <parameter type-id='2cbe6893'/>
>+              <parameter type-id='934aae90' is-artificial='yes'/>
>+              <parameter type-id='f4e12a25'/>
>+              <parameter type-id='98af9011'/>
>+              <parameter type-id='b6a32cf4'/>
>+              <parameter type-id='1c1010fb'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__hash_table&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::__unordered_map_hasher&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, android::SurfaceComposerClient::SCHash, true&gt;, std::__1::__unordered_map_equal&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, true&gt;, std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/__hash_table' line='893' column='1' id='0fcd7eac'>
>+        <class-decl name='__hash_table&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::__unordered_map_hasher&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::hash&lt;ASurfaceControl *&gt;, true&gt;, std::__1::__unordered_map_equal&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::equal_to&lt;ASurfaceControl *&gt;, true&gt;, std::__1::allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/__hash_table' line='893' column='1' id='f8fe7006'>
>           <member-type access='private'>
>-            <typedef-decl name='__bucket_list' type-id='3c8048f0' filepath='external/libcxx/include/__hash_table' line='950' column='1' id='3db3a374'/>
>+            <typedef-decl name='__bucket_list' type-id='059cd7ca' filepath='external/libcxx/include/__hash_table' line='950' column='1' id='fea03b2c'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='4df509ee' filepath='external/libcxx/include/__hash_table' line='916' column='1' id='5fb1fd5f'/>
>+            <typedef-decl name='size_type' type-id='a21ad21a' filepath='external/libcxx/include/__hash_table' line='916' column='1' id='58367bd7'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='hasher' type-id='25a1429c' filepath='external/libcxx/include/__hash_table' line='897' column='1' id='3929eec0'/>
>+            <typedef-decl name='hasher' type-id='23174d54' filepath='external/libcxx/include/__hash_table' line='897' column='1' id='aec3b808'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='key_equal' type-id='8567fb19' filepath='external/libcxx/include/__hash_table' line='898' column='1' id='e4d702a5'/>
>+            <typedef-decl name='key_equal' type-id='195562bd' filepath='external/libcxx/include/__hash_table' line='898' column='1' id='d859ed7d'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='__node_allocator' type-id='6e3b05fe' filepath='external/libcxx/include/__hash_table' line='925' column='1' id='eb3dee6b'/>
>+            <typedef-decl name='__node_allocator' type-id='e31e7b10' filepath='external/libcxx/include/__hash_table' line='925' column='1' id='004d2b63'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='eaedaeb4' filepath='external/libcxx/include/__hash_table' line='899' column='1' id='9f9d6391'/>
>+            <typedef-decl name='allocator_type' type-id='1a3c1a10' filepath='external/libcxx/include/__hash_table' line='899' column='1' id='f4c9a239'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='__next_pointer' type-id='4922730c' filepath='external/libcxx/include/__hash_table' line='932' column='1' id='34dbc4c6'/>
>+            <typedef-decl name='__next_pointer' type-id='0787618a' filepath='external/libcxx/include/__hash_table' line='932' column='1' id='cb6f5f2e'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='21a2c439' filepath='external/libcxx/include/__hash_table' line='896' column='1' id='f62f5ba5'/>
>+            <typedef-decl name='value_type' type-id='68b1ae7f' filepath='external/libcxx/include/__hash_table' line='896' column='1' id='fb0f191d'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='__node_pointer' type-id='e54a60cd' filepath='external/libcxx/include/__hash_table' line='928' column='1' id='4ba10a93'/>
>+            <typedef-decl name='__node_pointer' type-id='40ca536f' filepath='external/libcxx/include/__hash_table' line='928' column='1' id='4046863b'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='e0800591' filepath='external/libcxx/include/__hash_table' line='989' column='1' id='1cc568d9'/>
>+            <typedef-decl name='iterator' type-id='0da74917' filepath='external/libcxx/include/__hash_table' line='989' column='1' id='662f6d81'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='cc09c171' filepath='external/libcxx/include/__hash_table' line='990' column='1' id='447f3659'/>
>+            <typedef-decl name='const_iterator' type-id='bd12d8b7' filepath='external/libcxx/include/__hash_table' line='990' column='1' id='a3586671'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='__container_value_type' type-id='ae15c6d0' filepath='external/libcxx/include/__hash_table' line='909' column='1' id='87bfa8ab'/>
>+            <typedef-decl name='__container_value_type' type-id='7a9a97d4' filepath='external/libcxx/include/__hash_table' line='909' column='1' id='1425a0d3'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='__node_holder' type-id='6370122f' filepath='external/libcxx/include/__hash_table' line='1232' column='1' id='efadd628'/>
>+            <typedef-decl name='__node_holder' type-id='b7880bd1' filepath='external/libcxx/include/__hash_table' line='1232' column='1' id='db9aee00'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='local_iterator' type-id='a58f61e1' filepath='external/libcxx/include/__hash_table' line='991' column='1' id='fcf150bd'/>
>+            <typedef-decl name='local_iterator' type-id='17052d87' filepath='external/libcxx/include/__hash_table' line='991' column='1' id='81502785'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_local_iterator' type-id='2133bd01' filepath='external/libcxx/include/__hash_table' line='992' column='1' id='2170b23d'/>
>+            <typedef-decl name='const_local_iterator' type-id='e84c2d67' filepath='external/libcxx/include/__hash_table' line='992' column='1' id='853fa755'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='_Dp' type-id='80632042' filepath='external/libcxx/include/__hash_table' line='1231' column='1' id='1bf40ec8'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='__pointer_allocator' type-id='c37f14c6' filepath='external/libcxx/include/__hash_table' line='948' column='1' id='1c3249a4'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__bucket_list_' type-id='3db3a374' visibility='default' filepath='external/libcxx/include/__hash_table' line='955' column='1'/>
>+            <var-decl name='__bucket_list_' type-id='fea03b2c' visibility='default' filepath='external/libcxx/include/__hash_table' line='955' column='1'/>
>           </data-member>
>           <data-member access='private' layout-offset-in-bits='64'>
>-            <var-decl name='__p1_' type-id='9019f6a3' visibility='default' filepath='external/libcxx/include/__hash_table' line='956' column='1'/>
>+            <var-decl name='__p1_' type-id='c5a5b793' visibility='default' filepath='external/libcxx/include/__hash_table' line='956' column='1'/>
>           </data-member>
>           <data-member access='private' layout-offset-in-bits='96'>
>-            <var-decl name='__p2_' type-id='48ffebb2' visibility='default' filepath='external/libcxx/include/__hash_table' line='957' column='1'/>
>+            <var-decl name='__p2_' type-id='22206262' visibility='default' filepath='external/libcxx/include/__hash_table' line='957' column='1'/>
>           </data-member>
>           <data-member access='private' layout-offset-in-bits='128'>
>-            <var-decl name='__p3_' type-id='7891cba1' visibility='default' filepath='external/libcxx/include/__hash_table' line='958' column='1'/>
>+            <var-decl name='__p3_' type-id='103edd01' visibility='default' filepath='external/libcxx/include/__hash_table' line='958' column='1'/>
>           </data-member>
>           <member-function access='public'>
>-            <function-decl name='__hash_table' mangled-name='_ZNSt3__112__hash_tableINS_17__hash_value_typeIN7android2spINS2_14SurfaceControlEEENS2_13ComposerStateEEENS_22__unordered_map_hasherIS5_S7_NS2_21SurfaceComposerClient6SCHashELb1EEENS_21__unordered_map_equalIS5_S7_NS_8equal_toIS5_EELb1EEENS_9allocatorIS7_EEEC2Ev' filepath='external/libcxx/include/__hash_table' line='995' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>+            <function-decl name='__hash_table' mangled-name='_ZNSt3__112__hash_tableINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEENS_22__unordered_map_hasherIS3_S5_NS_4hashIS3_EELb1EEENS_21__unordered_map_equalIS3_S5_NS_8equal_toIS3_EELb1EEENS_9allocatorIS5_EEEC2Ev' filepath='external/libcxx/include/__hash_table' line='995' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1003' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>-              <parameter type-id='44cd9842'/>
>-              <parameter type-id='c96c9f49'/>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>+              <parameter type-id='c4204c5a'/>
>+              <parameter type-id='113bbc11'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1004' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>-              <parameter type-id='44cd9842'/>
>-              <parameter type-id='c96c9f49'/>
>-              <parameter type-id='26de8845'/>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>+              <parameter type-id='c4204c5a'/>
>+              <parameter type-id='113bbc11'/>
>+              <parameter type-id='5e45337d'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1006' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>-              <parameter type-id='26de8845'/>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>+              <parameter type-id='5e45337d'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1007' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>-              <parameter type-id='f46f0b9f'/>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>+              <parameter type-id='6451ea97'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1008' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>-              <parameter type-id='f46f0b9f'/>
>-              <parameter type-id='26de8845'/>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>+              <parameter type-id='6451ea97'/>
>+              <parameter type-id='5e45337d'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1010' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>-              <parameter type-id='2a485110'/>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>+              <parameter type-id='6b50131a'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1017' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>-              <parameter type-id='2a485110'/>
>-              <parameter type-id='26de8845'/>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>+              <parameter type-id='6b50131a'/>
>+              <parameter type-id='5e45337d'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public' destructor='yes'>
>-            <function-decl name='~__hash_table' mangled-name='_ZNSt3__112__hash_tableINS_17__hash_value_typeIN7android2spINS2_14SurfaceControlEEENS2_13ComposerStateEEENS_22__unordered_map_hasherIS5_S7_NS2_21SurfaceComposerClient6SCHashELb1EEENS_21__unordered_map_equalIS5_S7_NS_8equal_toIS5_EELb1EEENS_9allocatorIS7_EEED2Ev' filepath='external/libcxx/include/__hash_table' line='1019' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9111677a' is-artificial='yes'/>
>+            <function-decl name='~__hash_table' mangled-name='_ZNSt3__112__hash_tableINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEENS_22__unordered_map_hasherIS3_S5_NS_4hashIS3_EELb1EEENS_21__unordered_map_equalIS3_S5_NS_8equal_toIS3_EELb1EEENS_9allocatorIS5_EEED2Ev' filepath='external/libcxx/include/__hash_table' line='1019' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4066724c' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='unique_ptr&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *[], std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='external/libcxx/include/memory' line='2663' column='1' id='3c8048f0'>
>+        <class-decl name='unique_ptr&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *[], std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='external/libcxx/include/memory' line='2663' column='1' id='059cd7ca'>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='341da367' filepath='external/libcxx/include/memory' line='2667' column='1' id='0b5df532'/>
>+            <typedef-decl name='pointer' type-id='038d41f5' filepath='external/libcxx/include/memory' line='2667' column='1' id='f0f58e88'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='deleter_type' type-id='a1475884' filepath='external/libcxx/include/memory' line='2666' column='1' id='c86d43f5'/>
>+            <typedef-decl name='deleter_type' type-id='6adafaa0' filepath='external/libcxx/include/memory' line='2666' column='1' id='695cb1f3'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__ptr_' type-id='0637ec34' visibility='default' filepath='external/libcxx/include/memory' line='2670' column='1'/>
>+            <var-decl name='__ptr_' type-id='b4beabaa' visibility='default' filepath='external/libcxx/include/memory' line='2670' column='1'/>
>           </data-member>
>           <member-function access='public'>
>             <function-decl name='unique_ptr' filepath='external/libcxx/include/memory' line='2791' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='cc031436' is-artificial='yes'/>
>-              <parameter type-id='48f6c374'/>
>+              <parameter type-id='02e7caa8' is-artificial='yes'/>
>+              <parameter type-id='c0da4c0e'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public' destructor='yes'>
>-            <function-decl name='~unique_ptr' mangled-name='_ZNSt3__110unique_ptrIA_PNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS4_14SurfaceControlEEENS4_13ComposerStateEEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISE_EEEEED2Ev' filepath='external/libcxx/include/memory' line='2887' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='cc031436' is-artificial='yes'/>
>+            <function-decl name='~unique_ptr' mangled-name='_ZNSt3__110unique_ptrIA_PNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISC_EEEEED2Ev' filepath='external/libcxx/include/memory' line='2887' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='02e7caa8' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unique_ptr&lt;true, void&gt;' mangled-name='_ZNSt3__110unique_ptrIA_PNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS4_14SurfaceControlEEENS4_13ComposerStateEEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISE_EEEEEC2ILb1EvEEv' filepath='external/libcxx/include/memory' line='2738' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='cc031436' is-artificial='yes'/>
>+            <function-decl name='unique_ptr&lt;true, void&gt;' mangled-name='_ZNSt3__110unique_ptrIA_PNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISC_EEEEEC2ILb1EvEEv' filepath='external/libcxx/include/memory' line='2738' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='02e7caa8' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **, std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='0637ec34'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='a8506f96'/>
>-          <base-class access='private' layout-offset-in-bits='32' type-id='d5807ece'/>
>+        <class-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; **, std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='b4beabaa'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='a1cedc70'/>
>+          <base-class access='private' layout-offset-in-bits='32' type-id='dd1e7d22'/>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **, true&gt;' mangled-name='_ZNSt3__117__compressed_pairIPPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS4_14SurfaceControlEEENS4_13ComposerStateEEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISE_EEEEEC2ISF_Lb1EEEOT_' filepath='external/libcxx/include/memory' line='2240' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='0cf96682' is-artificial='yes'/>
>-              <parameter type-id='11ad285b'/>
>+            <function-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; **, true&gt;' mangled-name='_ZNSt3__117__compressed_pairIPPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISC_EEEEEC2ISD_Lb1EEEOT_' filepath='external/libcxx/include/memory' line='2240' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='60758ba8' is-artificial='yes'/>
>+              <parameter type-id='831c85d9'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='a8506f96'>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; **, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='a1cedc70'>
>           <member-type access='public'>
>-            <typedef-decl name='reference' type-id='21039b3f' filepath='external/libcxx/include/memory' line='2136' column='1' id='7f802666'/>
>+            <typedef-decl name='reference' type-id='730eae45' filepath='external/libcxx/include/memory' line='2136' column='1' id='c56d80c2'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='f2b2449a' filepath='external/libcxx/include/memory' line='2137' column='1' id='e28a9f8a'/>
>+            <typedef-decl name='const_reference' type-id='60fc3448' filepath='external/libcxx/include/memory' line='2137' column='1' id='8c3b2cc6'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='97cfbb03' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+            <var-decl name='__value_' type-id='0b39d7e1' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>           </data-member>
>           <member-function access='public'>
>             <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='e84ff04c' is-artificial='yes'/>
>+              <parameter type-id='74d54206' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='56' column='1' id='8a3fab4b'>
>+        <class-decl name='__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='56' column='1' id='4b57f679'>
>           <member-type access='public'>
>-            <typedef-decl name='__next_pointer' type-id='cc6db4eb' filepath='external/libcxx/include/__hash_table' line='69' column='1' id='f0c35ac7'/>
>+            <typedef-decl name='__next_pointer' type-id='a9c1aaed' filepath='external/libcxx/include/__hash_table' line='69' column='1' id='825761eb'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='__node_pointer' type-id='f132d3c4' filepath='external/libcxx/include/__hash_table' line='61' column='1' id='15f864ea'/>
>+            <typedef-decl name='__node_pointer' type-id='42e90df0' filepath='external/libcxx/include/__hash_table' line='61' column='1' id='5a880336'/>
>           </member-type>
>           <data-member access='public' layout-offset-in-bits='0'>
>-            <var-decl name='__next_' type-id='f0c35ac7' visibility='default' filepath='external/libcxx/include/__hash_table' line='72' column='1'/>
>+            <var-decl name='__next_' type-id='825761eb' visibility='default' filepath='external/libcxx/include/__hash_table' line='72' column='1'/>
>           </data-member>
>           <member-function access='public'>
>             <function-decl name='__hash_node_base' filepath='external/libcxx/include/__hash_table' line='91' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='ad4706fb' is-artificial='yes'/>
>+              <parameter type-id='4b797911' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='conditional&lt;true, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='429' column='1' id='f581b5c8'>
>+        <class-decl name='conditional&lt;true, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='429' column='1' id='7516fd76'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='ad4706fb' filepath='external/libcxx/include/type_traits' line='429' column='1' id='cc6db4eb'/>
>+            <typedef-decl name='type' type-id='4b797911' filepath='external/libcxx/include/type_traits' line='429' column='1' id='a9c1aaed'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt;' size-in-bits='4800' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='95' column='1' id='c67da3ae'>
>-          <base-class access='public' layout-offset-in-bits='0' type-id='8a3fab4b'/>
>+        <class-decl name='__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='95' column='1' id='a18cd1c2'>
>+          <base-class access='public' layout-offset-in-bits='0' type-id='4b57f679'/>
>           <member-type access='public'>
>-            <typedef-decl name='__node_value_type' type-id='21a2c439' filepath='external/libcxx/include/__hash_table' line='101' column='1' id='2a933c08'/>
>+            <typedef-decl name='__node_value_type' type-id='68b1ae7f' filepath='external/libcxx/include/__hash_table' line='101' column='1' id='2f67f412'/>
>           </member-type>
>           <data-member access='public' layout-offset-in-bits='32'>
>             <var-decl name='__hash_' type-id='b59d7dce' visibility='default' filepath='external/libcxx/include/__hash_table' line='103' column='1'/>
>           </data-member>
>           <data-member access='public' layout-offset-in-bits='64'>
>-            <var-decl name='__value_' type-id='2a933c08' visibility='default' filepath='external/libcxx/include/__hash_table' line='104' column='1'/>
>+            <var-decl name='__value_' type-id='2f67f412' visibility='default' filepath='external/libcxx/include/__hash_table' line='104' column='1'/>
>           </data-member>
>         </class-decl>
>-        <class-decl name='__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;' size-in-bits='4736' is-struct='yes' visibility='default' filepath='external/libcxx/include/unordered_map' line='628' column='1' id='21a2c439'>
>+        <class-decl name='__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='external/libcxx/include/unordered_map' line='628' column='1' id='68b1ae7f'>
>           <member-type access='public'>
>-            <typedef-decl name='value_type' type-id='e0bee049' filepath='external/libcxx/include/unordered_map' line='632' column='1' id='4355225c'/>
>+            <typedef-decl name='value_type' type-id='b9953957' filepath='external/libcxx/include/unordered_map' line='632' column='1' id='7fc77ef8'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='__nc_ref_pair_type' type-id='3bad31be' filepath='external/libcxx/include/unordered_map' line='633' column='1' id='b0b75e27'/>
>+            <typedef-decl name='__nc_ref_pair_type' type-id='01608bde' filepath='external/libcxx/include/unordered_map' line='633' column='1' id='b7fcc7eb'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='__nc_rref_pair_type' type-id='c98c9c82' filepath='external/libcxx/include/unordered_map' line='634' column='1' id='515a692d'/>
>+            <typedef-decl name='__nc_rref_pair_type' type-id='b83aca4a' filepath='external/libcxx/include/unordered_map' line='634' column='1' id='589b1859'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__cc' type-id='4355225c' visibility='default' filepath='external/libcxx/include/unordered_map' line='637' column='1'/>
>+            <var-decl name='__cc' type-id='7fc77ef8' visibility='default' filepath='external/libcxx/include/unordered_map' line='637' column='1'/>
>           </data-member>
>           <member-function access='private'>
>             <function-decl name='__hash_value_type' filepath='external/libcxx/include/unordered_map' line='703' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='eb6ff061' is-artificial='yes'/>
>-              <parameter type-id='e9fc9640'/>
>+              <parameter type-id='302e0f27' is-artificial='yes'/>
>+              <parameter type-id='99a44b44'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='private'>
>             <function-decl name='__hash_value_type' filepath='external/libcxx/include/unordered_map' line='704' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='eb6ff061' is-artificial='yes'/>
>-              <parameter type-id='882dae49'/>
>+              <parameter type-id='302e0f27' is-artificial='yes'/>
>+              <parameter type-id='596452ff'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='private' destructor='yes'>
>             <function-decl name='~__hash_value_type' filepath='external/libcxx/include/unordered_map' line='708' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='eb6ff061' is-artificial='yes'/>
>+              <parameter type-id='302e0f27' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;' size-in-bits='4736' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='315' column='1' id='e0bee049'>
>+        <class-decl name='pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='315' column='1' id='b9953957'>
>           <data-member access='public' layout-offset-in-bits='0'>
>-            <var-decl name='first' type-id='59d71b0f' visibility='default' filepath='external/libcxx/include/utility' line='323' column='1'/>
>+            <var-decl name='first' type-id='f8a9b7c9' visibility='default' filepath='external/libcxx/include/utility' line='323' column='1'/>
>           </data-member>
>           <data-member access='public' layout-offset-in-bits='64'>
>-            <var-decl name='second' type-id='d684da9f' visibility='default' filepath='external/libcxx/include/utility' line='324' column='1'/>
>+            <var-decl name='second' type-id='5d04a8c3' visibility='default' filepath='external/libcxx/include/utility' line='324' column='1'/>
>           </data-member>
>           <member-function access='public'>
>             <function-decl name='pair' filepath='external/libcxx/include/utility' line='327' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='672fb3d1' is-artificial='yes'/>
>-              <parameter type-id='2762005a'/>
>+              <parameter type-id='ff43352f' is-artificial='yes'/>
>+              <parameter type-id='4fc0425c'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='pair' filepath='external/libcxx/include/utility' line='328' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='672fb3d1' is-artificial='yes'/>
>-              <parameter type-id='c70e5799'/>
>+              <parameter type-id='ff43352f' is-artificial='yes'/>
>+              <parameter type-id='7fd67367'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='private'>
>+            <function-decl name='pair&lt;ASurfaceControl *const &amp;, 0&gt;' mangled-name='_ZNSt3__14pairIKP15ASurfaceControl20ASurfaceControlStatsEC2IJRS3_EJEJLj0EEJEEENS_21piecewise_construct_tERNS_5tupleIJDpT_EEERNS9_IJDpT0_EEENS_15__tuple_indicesIJXspT1_EEEENSI_IJXspT2_EEEE' filepath='external/libcxx/include/utility' line='565' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='ff43352f' is-artificial='yes'/>
>+              <parameter type-id='4582d906'/>
>+              <parameter type-id='efa5f087'/>
>+              <parameter type-id='57c94099'/>
>+              <parameter type-id='d0bb5fc7'/>
>+              <parameter type-id='c527ef4d'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;unsigned char *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='6154d891'>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='a24d1fe6' filepath='external/libcxx/include/memory' line='2136' column='1' id='1d029a5f'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='e876e5ab' filepath='external/libcxx/include/memory' line='2137' column='1' id='9b0c0f4f'/>
>-          </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='cf536864' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>-          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='5d982d79' is-artificial='yes'/>
>+            <function-decl name='pair&lt;ASurfaceControl *const &amp;&gt;' mangled-name='_ZNSt3__14pairIKP15ASurfaceControl20ASurfaceControlStatsEC2IJRS3_EJEEENS_21piecewise_construct_tENS_5tupleIJDpT_EEENS9_IJDpT0_EEE' filepath='external/libcxx/include/utility' line='506' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='ff43352f' is-artificial='yes'/>
>+              <parameter type-id='4582d906'/>
>+              <parameter type-id='3982c1f3'/>
>+              <parameter type-id='ad3ebb8d'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>@@ -24856,5699 +26282,5690 @@
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='vector&lt;unsigned char, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='b05cdcb7'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='d5b8afe1'/>
>-          <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='28ac9f25' filepath='external/libcxx/include/vector' line='479' column='1' id='61c54ac4'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='26dd3530' filepath='external/libcxx/include/vector' line='483' column='1' id='d5277a54'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='002ac4a6' filepath='external/libcxx/include/vector' line='478' column='1' id='58b97fd4'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='8b583b33' filepath='external/libcxx/include/vector' line='482' column='1' id='b7731497'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='68fdf037' filepath='external/libcxx/include/vector' line='487' column='1' id='b239ece8'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='5ec92c0a' filepath='external/libcxx/include/vector' line='488' column='1' id='35ddcf48'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='reverse_iterator' type-id='b0b63972' filepath='external/libcxx/include/vector' line='489' column='1' id='ef32aa33'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_reverse_iterator' type-id='5f2bceeb' filepath='external/libcxx/include/vector' line='490' column='1' id='88519a53'/>
>+        <class-decl name='conditional&lt;false, std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt;, std::__1::__nat&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='01dde707'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='13623784' filepath='external/libcxx/include/type_traits' line='431' column='1' id='e533247c'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='piecewise_construct_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='298' column='1' id='4582d906'/>
>+        <class-decl name='tuple&lt;ASurfaceControl *const &amp;&gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/tuple' line='470' column='1' id='3982c1f3'>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='35ba8be3' filepath='external/libcxx/include/vector' line='481' column='1' id='374cd9b7'/>
>+            <typedef-decl name='_BaseT' type-id='6ab6a882' filepath='external/libcxx/include/tuple' line='472' column='1' id='5d65f50c'/>
>           </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='c59bbd7f' filepath='external/libcxx/include/vector' line='485' column='1' id='628edda3'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='413a012f' filepath='external/libcxx/include/vector' line='486' column='1' id='9da97f83'/>
>-          </member-type>
>-          <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='496' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='502' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='f6694716'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__base_' type-id='5d65f50c' visibility='default' filepath='external/libcxx/include/tuple' line='474' column='1'/>
>+          </data-member>
>+          <data-member access='private' static='yes'>
>+            <var-decl name='_EnableImplicitReducedArityExtension' type-id='4ab96a04' visibility='default' filepath='external/libcxx/include/tuple' line='479' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='514' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='d5277a54'/>
>+            <function-decl name='tuple' filepath='external/libcxx/include/tuple' line='616' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='e3a5dda3' is-artificial='yes'/>
>+              <parameter type-id='ce4e0186'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='516' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='d5277a54'/>
>-              <parameter type-id='f6694716'/>
>+            <function-decl name='tuple' filepath='external/libcxx/include/tuple' line='617' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='e3a5dda3' is-artificial='yes'/>
>+              <parameter type-id='e339cd73'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='__tuple_impl&lt;std::__1::__tuple_indices&lt;0&gt;, ASurfaceControl *const &amp;&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/tuple' line='365' column='1' id='6ab6a882'>
>+          <base-class access='public' layout-offset-in-bits='0' type-id='13e36007'/>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='518' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='d5277a54'/>
>-              <parameter type-id='63e62b06'/>
>+            <function-decl name='__tuple_impl' filepath='external/libcxx/include/tuple' line='369' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='aa2cee90' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='519' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='d5277a54'/>
>-              <parameter type-id='63e62b06'/>
>-              <parameter type-id='f6694716'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public' destructor='yes'>
>-            <function-decl name='~vector' mangled-name='_ZNSt3__16vectorIhNS_9allocatorIhEEED2Ev' filepath='external/libcxx/include/vector' line='550' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>+            <function-decl name='__tuple_impl' filepath='external/libcxx/include/tuple' line='440' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='aa2cee90' is-artificial='yes'/>
>+              <parameter type-id='86cc090f'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='558' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='bf3fae58'/>
>+            <function-decl name='__tuple_impl' filepath='external/libcxx/include/tuple' line='441' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='aa2cee90' is-artificial='yes'/>
>+              <parameter type-id='1ad91416'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='__tuple_leaf&lt;0, ASurfaceControl *const &amp;, false&gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/tuple' line='171' column='1' id='13e36007'>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='622c8d3d' visibility='default' filepath='external/libcxx/include/tuple' line='173' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='559' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='bf3fae58'/>
>-              <parameter type-id='f6694716'/>
>+            <function-decl name='__tuple_leaf' filepath='external/libcxx/include/tuple' line='186' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='8d74ddff' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='565' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='8723cba4'/>
>+            <function-decl name='__tuple_leaf' filepath='external/libcxx/include/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='8d74ddff' is-artificial='yes'/>
>+              <parameter type-id='cf50c78c'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='568' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='8723cba4'/>
>-              <parameter type-id='f6694716'/>
>+            <function-decl name='__tuple_leaf' filepath='external/libcxx/include/tuple' line='248' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='8d74ddff' is-artificial='yes'/>
>+              <parameter type-id='68039797'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='conditional&lt;false, std::__1::tuple&lt;ASurfaceControl *const &amp;&gt;, std::__1::__nat&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='b54bc9ad'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='13623784' filepath='external/libcxx/include/type_traits' line='431' column='1' id='df1c6778'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='tuple&lt;&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/tuple' line='907' column='1' id='ad3ebb8d'>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='571' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='22a84077'/>
>+            <function-decl name='tuple' filepath='external/libcxx/include/tuple' line='911' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='63c9537d' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='__tuple_indices&lt;0&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='d0bb5fc7'/>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt;, 1, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='dd1e7d22'>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='0b213b9a' filepath='external/libcxx/include/memory' line='2136' column='1' id='1c704fa4'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='4a2e14bd' filepath='external/libcxx/include/memory' line='2137' column='1' id='ee619134'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='6adafaa0' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='579' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='94829ddf' is-artificial='yes'/>
>-              <parameter type-id='22a84077'/>
>-              <parameter type-id='f6694716'/>
>+            <function-decl name='__compressed_pair_elem' mangled-name='_ZNSt3__122__compressed_pair_elemINS_25__bucket_list_deallocatorINS_9allocatorIPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEEPvEEEEEEEELi1ELb0EEC2Ev' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='f47054b0' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__vector_base&lt;unsigned char, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='326' column='1' id='d5b8afe1'>
>-          <base-class access='protected' layout-offset-in-bits='0' type-id='2328d49c'/>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='dce739de' filepath='external/libcxx/include/vector' line='338' column='1' id='c59bbd7f'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='28ac9f25' filepath='external/libcxx/include/vector' line='330' column='1' id='5f3c1b08'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='a7119125' filepath='external/libcxx/include/vector' line='332' column='1' id='26dd3530'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='fd9e4c12' filepath='external/libcxx/include/vector' line='336' column='1' id='8b583b33'/>
>-          </member-type>
>+        <class-decl name='__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/__hash_table' line='767' column='1' id='6adafaa0'>
>           <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='002ac4a6' filepath='external/libcxx/include/vector' line='334' column='1' id='24661bb0'/>
>+            <typedef-decl name='allocator_type' type-id='ecafdbf2' filepath='external/libcxx/include/__hash_table' line='769' column='1' id='8ed7a653'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='105a94ff' filepath='external/libcxx/include/vector' line='335' column='1' id='35ba8be3'/>
>+            <typedef-decl name='size_type' type-id='a894f528' filepath='external/libcxx/include/__hash_table' line='771' column='1' id='dce954fd'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='1d1e4a52' filepath='external/libcxx/include/vector' line='339' column='1' id='413a012f'/>
>+            <typedef-decl name='pointer' type-id='b964d2a7' filepath='external/libcxx/include/__hash_table' line='775' column='1' id='fdae5b46'/>
>           </member-type>
>-          <data-member access='protected' layout-offset-in-bits='0'>
>-            <var-decl name='__begin_' type-id='c59bbd7f' visibility='default' filepath='external/libcxx/include/vector' line='343' column='1'/>
>-          </data-member>
>-          <data-member access='protected' layout-offset-in-bits='32'>
>-            <var-decl name='__end_' type-id='c59bbd7f' visibility='default' filepath='external/libcxx/include/vector' line='344' column='1'/>
>-          </data-member>
>-          <data-member access='protected' layout-offset-in-bits='64'>
>-            <var-decl name='__end_cap_' type-id='0dcdf9bc' visibility='default' filepath='external/libcxx/include/vector' line='345' column='1'/>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__data_' type-id='bd8c2724' visibility='default' filepath='external/libcxx/include/__hash_table' line='773' column='1'/>
>           </data-member>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='361' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='64e46a69' is-artificial='yes'/>
>+          <member-function access='public'>
>+            <function-decl name='__bucket_list_deallocator' mangled-name='_ZNSt3__125__bucket_list_deallocatorINS_9allocatorIPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEEPvEEEEEEEC2Ev' filepath='external/libcxx/include/__hash_table' line='778' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='ff2128b6' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='363' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='64e46a69' is-artificial='yes'/>
>-              <parameter type-id='bac98f9a'/>
>+          <member-function access='public'>
>+            <function-decl name='__bucket_list_deallocator' filepath='external/libcxx/include/__hash_table' line='783' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='ff2128b6' is-artificial='yes'/>
>+              <parameter type-id='67a2755f'/>
>+              <parameter type-id='dce954fd'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='365' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='64e46a69' is-artificial='yes'/>
>-              <parameter type-id='fef2702b'/>
>+          <member-function access='public'>
>+            <function-decl name='__bucket_list_deallocator' filepath='external/libcxx/include/__hash_table' line='789' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='ff2128b6' is-artificial='yes'/>
>+              <parameter type-id='415108f4'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-          <member-function access='protected' destructor='yes'>
>-            <function-decl name='~__vector_base' mangled-name='_ZNSt3__113__vector_baseIhNS_9allocatorIhEEED2Ev' filepath='external/libcxx/include/vector' line='367' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='64e46a69' is-artificial='yes'/>
>+        </class-decl>
>+        <class-decl name='__compressed_pair&lt;unsigned int, std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='bd8c2724'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='8051cbec'/>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='19982a43'/>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair&lt;int, true&gt;' mangled-name='_ZNSt3__117__compressed_pairIjNS_9allocatorIPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEEPvEEEEEEEC2IiLb1EEEOT_' filepath='external/libcxx/include/memory' line='2240' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='bfbcbf12' is-artificial='yes'/>
>+              <parameter type-id='75f9e64a'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='ff9e45a2'>
>-          <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='ffcac889' filepath='external/libcxx/include/memory' line='1517' column='1' id='dce739de'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='allocator_type' type-id='28ac9f25' filepath='external/libcxx/include/memory' line='1514' column='1' id='9397db6b'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='size_type' type-id='8901831f' filepath='external/libcxx/include/memory' line='1523' column='1' id='a7119125'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_void_pointer' type-id='228e3758' filepath='external/libcxx/include/memory' line='1520' column='1' id='01330bc9'/>
>-          </member-type>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='19982a43'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='ecafdbf2'/>
>           <member-type access='public'>
>-            <typedef-decl name='const_pointer' type-id='c5323fa3' filepath='external/libcxx/include/memory' line='1518' column='1' id='1d1e4a52'/>
>+            <typedef-decl name='reference' type-id='b1ac3ef4' filepath='external/libcxx/include/memory' line='2174' column='1' id='19bc1379'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='__pointer_type&lt;unsigned char, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='4f2cbfc0'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='d119eda0' filepath='external/libcxx/include/memory' line='1031' column='1' id='ffcac889'/>
>+            <typedef-decl name='const_reference' type-id='c5a8c96b' filepath='external/libcxx/include/memory' line='2175' column='1' id='2dfc2295'/>
>           </member-type>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c3233b13' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>         </class-decl>
>-        <class-decl name='allocator&lt;unsigned char&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='28ac9f25'>
>+        <class-decl name='allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='ecafdbf2'>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='cf536864' filepath='external/libcxx/include/memory' line='1786' column='1' id='846a684d'/>
>+            <typedef-decl name='pointer' type-id='0b39d7e1' filepath='external/libcxx/include/memory' line='1786' column='1' id='27be210c'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='c3535580' filepath='external/libcxx/include/memory' line='1788' column='1' id='8cf6f1b9'/>
>+            <typedef-decl name='reference' type-id='0739d195' filepath='external/libcxx/include/memory' line='1788' column='1' id='b623258c'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='354f7eb9' filepath='external/libcxx/include/memory' line='1787' column='1' id='dc029499'/>
>+            <typedef-decl name='const_pointer' type-id='7f39e48c' filepath='external/libcxx/include/memory' line='1787' column='1' id='fbf39b0c'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='414f919d' filepath='external/libcxx/include/memory' line='1789' column='1' id='24f7e9d5'/>
>+            <typedef-decl name='const_reference' type-id='8339ead8' filepath='external/libcxx/include/memory' line='1789' column='1' id='30362f8c'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='0b1ca1b6'/>
>+            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='517fb773'/>
>           </member-type>
>           <member-function access='public'>
>             <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c0b42655' is-artificial='yes'/>
>+              <parameter type-id='a5ac2c10' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__size_type&lt;std::__1::allocator&lt;unsigned char&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='0c0bc9da'>
>+        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='8c755279'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='0b1ca1b6' filepath='external/libcxx/include/memory' line='1171' column='1' id='8901831f'/>
>+            <typedef-decl name='pointer' type-id='100de4af' filepath='external/libcxx/include/memory' line='1517' column='1' id='b964d2a7'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='allocator_type' type-id='ecafdbf2' filepath='external/libcxx/include/memory' line='1514' column='1' id='d34c4d90'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='size_type' type-id='f0a4623c' filepath='external/libcxx/include/memory' line='1523' column='1' id='a894f528'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_void_pointer' type-id='71dbc3ee' filepath='external/libcxx/include/memory' line='1520' column='1' id='2d73dba2'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__const_void_pointer&lt;unsigned char *, std::__1::allocator&lt;unsigned char&gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='4c328bb5'>
>+        <class-decl name='__pointer_type&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *, std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='363c7df6'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='7d00dc99' filepath='external/libcxx/include/memory' line='1097' column='1' id='228e3758'/>
>+            <typedef-decl name='type' type-id='089a801e' filepath='external/libcxx/include/memory' line='1031' column='1' id='100de4af'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='pointer_traits&lt;unsigned char *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='7be7a313'>
>+        <class-decl name='__size_type&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='fad0472d'>
>           <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='cf536864' filepath='external/libcxx/include/memory' line='974' column='1' id='f51c2021'/>
>+            <typedef-decl name='type' type-id='517fb773' filepath='external/libcxx/include/memory' line='1171' column='1' id='f0a4623c'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='__const_void_pointer&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; **, std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='b7051df1'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='fc367320' filepath='external/libcxx/include/memory' line='1097' column='1' id='71dbc3ee'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='pointer_traits&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; **&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='3402e1b4'>
>           <member-type access='public'>
>-            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='7d00dc99'/>
>+            <typedef-decl name='pointer' type-id='0b39d7e1' filepath='external/libcxx/include/memory' line='974' column='1' id='fdfcd17e'/>
>           </member-type>
>           <member-type access='public'>
>-            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='5991ae90'/>
>+            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='fc367320'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='f09257dd'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;unsigned char *&gt;::__nat, unsigned char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='e7caa1da'>
>+        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; **&gt;::__nat, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='af8c4542'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='002ac4a6' filepath='external/libcxx/include/type_traits' line='431' column='1' id='111109fd'/>
>+            <typedef-decl name='type' type-id='4b797911' filepath='external/libcxx/include/type_traits' line='431' column='1' id='a84a4dab'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__const_pointer&lt;unsigned char, unsigned char *, std::__1::allocator&lt;unsigned char&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1042' column='1' id='6a147670'>
>+        <class-decl name='add_lvalue_reference&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1127' column='1' id='9eab83fa'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='dc029499' filepath='external/libcxx/include/memory' line='1044' column='1' id='c5323fa3'/>
>+            <typedef-decl name='type' type-id='314017d0' filepath='external/libcxx/include/type_traits' line='1128' column='1' id='bd1d6151'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__compressed_pair&lt;unsigned char *, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='0dcdf9bc'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='6154d891'/>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='69cf5b58'/>
>+        <class-decl name='__add_lvalue_reference_impl&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1125' column='1' id='96ea2e79'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='0739d195' filepath='external/libcxx/include/type_traits' line='1125' column='1' id='314017d0'/>
>+          </member-type>
>         </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;unsigned char&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='69cf5b58'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='28ac9f25'/>
>+        <class-decl name='__pointer_type&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *, std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='97162aa0'>
>           <member-type access='public'>
>-            <typedef-decl name='reference' type-id='c4b42ca1' filepath='external/libcxx/include/memory' line='2174' column='1' id='426d3488'/>
>+            <typedef-decl name='type' type-id='0c430c60' filepath='external/libcxx/include/memory' line='1031' column='1' id='038d41f5'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;, std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='c5a5b793'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='7076d372'/>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='7211bb36'/>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='7076d372'>
>           <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='98a103fa' filepath='external/libcxx/include/memory' line='2175' column='1' id='59dc0248'/>
>+            <typedef-decl name='reference' type-id='477972c5' filepath='external/libcxx/include/memory' line='2136' column='1' id='a240ce12'/>
>           </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='b8435020' filepath='external/libcxx/include/memory' line='2137' column='1' id='1a1a30f6'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='4b57f679' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='e8fe63ee' is-artificial='yes'/>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='efd56ff0' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='vector&lt;long long, std::__1::allocator&lt;long long&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='1e253049'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='721e3983'/>
>-          <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='f4b76f72' filepath='external/libcxx/include/vector' line='479' column='1' id='3b3f6d46'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='f3dbad4e' filepath='external/libcxx/include/vector' line='483' column='1' id='48b8e292'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='1eb56b1e' filepath='external/libcxx/include/vector' line='478' column='1' id='7f6e0a92'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='cc0c668d' filepath='external/libcxx/include/vector' line='482' column='1' id='5d912f41'/>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='7211bb36'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='1b6ff35f'/>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='c5e02ee3' filepath='external/libcxx/include/memory' line='2174' column='1' id='6cecc540'/>
>           </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='efded478' filepath='external/libcxx/include/vector' line='487' column='1' id='99bfba62'/>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='da65c252' filepath='external/libcxx/include/memory' line='2175' column='1' id='434712f0'/>
>           </member-type>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4cf4886c' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='1b6ff35f'>
>           <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='2d3a5701' filepath='external/libcxx/include/vector' line='488' column='1' id='9aea7a46'/>
>+            <typedef-decl name='pointer' type-id='42e90df0' filepath='external/libcxx/include/memory' line='1786' column='1' id='28845575'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reverse_iterator' type-id='bab30871' filepath='external/libcxx/include/vector' line='489' column='1' id='a8d2cb89'/>
>+            <typedef-decl name='reference' type-id='4ee920d4' filepath='external/libcxx/include/memory' line='1788' column='1' id='dce2fd41'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reverse_iterator' type-id='0a83870c' filepath='external/libcxx/include/vector' line='490' column='1' id='0d624ef5'/>
>+            <typedef-decl name='const_pointer' type-id='ae0a3db9' filepath='external/libcxx/include/memory' line='1787' column='1' id='891d9531'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='959ee201' filepath='external/libcxx/include/vector' line='481' column='1' id='642663f5'/>
>+            <typedef-decl name='const_reference' type-id='ba0a509d' filepath='external/libcxx/include/memory' line='1789' column='1' id='9a4a23cd'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='2a5e9835' filepath='external/libcxx/include/vector' line='485' column='1' id='81c398b9'/>
>+            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='f7b18f8e'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='0518e5f1' filepath='external/libcxx/include/vector' line='486' column='1' id='d986b775'/>
>+            <class-decl name='rebind&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1795' column='1' id='83890a95'>
>+              <member-type access='public'>
>+                <typedef-decl name='other' type-id='ecafdbf2' filepath='external/libcxx/include/memory' line='1795' column='1' id='7f342dc2'/>
>+              </member-type>
>+            </class-decl>
>           </member-type>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='496' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='502' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='8ece3cf0'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='514' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='48b8e292'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='516' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='48b8e292'/>
>-              <parameter type-id='8ece3cf0'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='518' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='48b8e292'/>
>-              <parameter type-id='cf9f4eec'/>
>+            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='d1e041c7' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='__compressed_pair&lt;unsigned int, std::__1::__unordered_map_hasher&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::hash&lt;ASurfaceControl *&gt;, true&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='22206262'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='8051cbec'/>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='60b8cb95'/>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__unordered_map_hasher&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::hash&lt;ASurfaceControl *&gt;, true&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='60b8cb95'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='23174d54'/>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='4fbe72de' filepath='external/libcxx/include/memory' line='2174' column='1' id='15e97e3b'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='24d71425' filepath='external/libcxx/include/memory' line='2175' column='1' id='e160ebfb'/>
>+          </member-type>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='519' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='48b8e292'/>
>-              <parameter type-id='cf9f4eec'/>
>-              <parameter type-id='8ece3cf0'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public' destructor='yes'>
>-            <function-decl name='~vector' filepath='external/libcxx/include/vector' line='550' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='554d4485' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='__unordered_map_hasher&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::hash&lt;ASurfaceControl *&gt;, true&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/unordered_map' line='425' column='1' id='23174d54'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='8f29ea84'/>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='558' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='7707f03e'/>
>+            <function-decl name='__unordered_map_hasher' filepath='external/libcxx/include/unordered_map' line='430' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4bbe6c92' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='559' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='7707f03e'/>
>-              <parameter type-id='8ece3cf0'/>
>+            <function-decl name='__unordered_map_hasher' filepath='external/libcxx/include/unordered_map' line='434' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4bbe6c92' is-artificial='yes'/>
>+              <parameter type-id='1387ebb3'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='hash&lt;ASurfaceControl *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='1323' column='1' id='8f29ea84'>
>+          <base-class access='public' layout-offset-in-bits='0' type-id='1aa42736'/>
>+        </class-decl>
>+        <class-decl name='unary_function&lt;ASurfaceControl *, unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='966' column='1' id='1aa42736'/>
>+        <class-decl name='__compressed_pair&lt;float, std::__1::__unordered_map_equal&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::equal_to&lt;ASurfaceControl *&gt;, true&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='103edd01'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='9884ef0e'/>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='28c670bc'/>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='565' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='b5ce4ba7'/>
>+            <function-decl name='__compressed_pair&lt;float, true&gt;' mangled-name='_ZNSt3__117__compressed_pairIfNS_21__unordered_map_equalIP15ASurfaceControlNS_17__hash_value_typeIS3_20ASurfaceControlStatsEENS_8equal_toIS3_EELb1EEEEC2IfLb1EEEOT_' filepath='external/libcxx/include/memory' line='2240' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='e4275f19' is-artificial='yes'/>
>+              <parameter type-id='0e7051ad'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__unordered_map_equal&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::equal_to&lt;ASurfaceControl *&gt;, true&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='28c670bc'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='195562bd'/>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='a41f9319' filepath='external/libcxx/include/memory' line='2174' column='1' id='80453e8e'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='66412ed8' filepath='external/libcxx/include/memory' line='2175' column='1' id='a3462a82'/>
>+          </member-type>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='568' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='b5ce4ba7'/>
>-              <parameter type-id='8ece3cf0'/>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='a9df81ea' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='__unordered_map_equal&lt;ASurfaceControl *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::equal_to&lt;ASurfaceControl *&gt;, true&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/unordered_map' line='494' column='1' id='195562bd'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='8b407fd0'/>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='571' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='cd9bbdb9'/>
>+            <function-decl name='__unordered_map_equal' filepath='external/libcxx/include/unordered_map' line='499' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='b01fa5fd' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='vector' filepath='external/libcxx/include/vector' line='579' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c96d0971' is-artificial='yes'/>
>-              <parameter type-id='cd9bbdb9'/>
>-              <parameter type-id='8ece3cf0'/>
>+            <function-decl name='__unordered_map_equal' filepath='external/libcxx/include/unordered_map' line='503' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='b01fa5fd' is-artificial='yes'/>
>+              <parameter type-id='24840e63'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__vector_base&lt;long long, std::__1::allocator&lt;long long&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='326' column='1' id='721e3983'>
>-          <base-class access='protected' layout-offset-in-bits='0' type-id='2328d49c'/>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='09332c13' filepath='external/libcxx/include/vector' line='338' column='1' id='2a5e9835'/>
>+        <class-decl name='equal_to&lt;ASurfaceControl *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/functional' line='674' column='1' id='8b407fd0'>
>+          <base-class access='public' layout-offset-in-bits='0' type-id='1288f78f'/>
>+        </class-decl>
>+        <class-decl name='binary_function&lt;ASurfaceControl *, ASurfaceControl *, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__functional_base' line='28' column='1' id='1288f78f'/>
>+        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='a372e797'>
>+          <member-type access='public'>
>+            <typedef-decl name='pointer' type-id='e21720a3' filepath='external/libcxx/include/memory' line='1517' column='1' id='1dea21d1'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='allocator_type' type-id='1a3c1a10' filepath='external/libcxx/include/memory' line='1514' column='1' id='b825a75e'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='size_type' type-id='672b246a' filepath='external/libcxx/include/memory' line='1523' column='1' id='a21ad21a'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_void_pointer' type-id='6d2dd712' filepath='external/libcxx/include/memory' line='1520' column='1' id='13338160'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='rebind_alloc&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;' type-id='89801c06' filepath='external/libcxx/include/memory' line='1535' column='1' id='1dd1da13'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='__pointer_type&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, std::__1::allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='7b8cf184'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='269f6fbc' filepath='external/libcxx/include/memory' line='1031' column='1' id='e21720a3'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='1a3c1a10'>
>           <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='f4b76f72' filepath='external/libcxx/include/vector' line='330' column='1' id='db3653aa'/>
>+            <typedef-decl name='pointer' type-id='302e0f27' filepath='external/libcxx/include/memory' line='1786' column='1' id='1e67833e'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='e9b1f164' filepath='external/libcxx/include/vector' line='332' column='1' id='f3dbad4e'/>
>+            <typedef-decl name='reference' type-id='242dfc43' filepath='external/libcxx/include/memory' line='1788' column='1' id='a439e90e'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='e52b4c68' filepath='external/libcxx/include/vector' line='336' column='1' id='cc0c668d'/>
>+            <typedef-decl name='const_pointer' type-id='8da43860' filepath='external/libcxx/include/memory' line='1787' column='1' id='b5e7c0f2'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='1eb56b1e' filepath='external/libcxx/include/vector' line='334' column='1' id='84efd30e'/>
>+            <typedef-decl name='const_reference' type-id='99a44b44' filepath='external/libcxx/include/memory' line='1789' column='1' id='49418102'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='c46fd041' filepath='external/libcxx/include/vector' line='335' column='1' id='959ee201'/>
>+            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='087633c5'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='ecfffc93' filepath='external/libcxx/include/vector' line='339' column='1' id='0518e5f1'/>
>+            <class-decl name='rebind&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1795' column='1' id='d354e009'>
>+              <member-type access='public'>
>+                <typedef-decl name='other' type-id='1b6ff35f' filepath='external/libcxx/include/memory' line='1795' column='1' id='60da666e'/>
>+              </member-type>
>+            </class-decl>
>           </member-type>
>-          <data-member access='protected' layout-offset-in-bits='0'>
>-            <var-decl name='__begin_' type-id='2a5e9835' visibility='default' filepath='external/libcxx/include/vector' line='343' column='1'/>
>-          </data-member>
>-          <data-member access='protected' layout-offset-in-bits='32'>
>-            <var-decl name='__end_' type-id='2a5e9835' visibility='default' filepath='external/libcxx/include/vector' line='344' column='1'/>
>-          </data-member>
>-          <data-member access='protected' layout-offset-in-bits='64'>
>-            <var-decl name='__end_cap_' type-id='508fa9fe' visibility='default' filepath='external/libcxx/include/vector' line='345' column='1'/>
>-          </data-member>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='361' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2967ce63' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='363' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2967ce63' is-artificial='yes'/>
>-              <parameter type-id='7543ee54'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='365' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2967ce63' is-artificial='yes'/>
>-              <parameter type-id='d70fe2d1'/>
>+          <member-function access='public'>
>+            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c975f866' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-          <member-function access='protected' destructor='yes'>
>-            <function-decl name='~__vector_base' filepath='external/libcxx/include/vector' line='367' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='2967ce63' is-artificial='yes'/>
>+        </class-decl>
>+        <class-decl name='__size_type&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='f1db42c7'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='087633c5' filepath='external/libcxx/include/memory' line='1171' column='1' id='672b246a'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='__const_void_pointer&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; *, std::__1::allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='41ce4105'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='ec7fed4a' filepath='external/libcxx/include/memory' line='1097' column='1' id='6d2dd712'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='pointer_traits&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='21642f52'>
>+          <member-type access='public'>
>+            <typedef-decl name='pointer' type-id='302e0f27' filepath='external/libcxx/include/memory' line='974' column='1' id='1718f400'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='ec7fed4a'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='c3c50763'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; *&gt;::__nat, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='87d7131a'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='68b1ae7f' filepath='external/libcxx/include/type_traits' line='431' column='1' id='286e257b'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='__allocator_traits_rebind&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1280' column='1' id='820cc00b'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='60da666e' filepath='external/libcxx/include/memory' line='1282' column='1' id='89801c06'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;unsigned char *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='6154d891'>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='a24d1fe6' filepath='external/libcxx/include/memory' line='2136' column='1' id='1d029a5f'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='e876e5ab' filepath='external/libcxx/include/memory' line='2137' column='1' id='9b0c0f4f'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='cf536864' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='5d982d79' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;long long&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='7c98e4dd'>
>+        <class-decl name='__rebind_alloc_helper&lt;std::__1::allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt; &gt;, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1769' column='1' id='c0a6a03d'>
>           <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='b32ceb8b' filepath='external/libcxx/include/memory' line='1517' column='1' id='09332c13'/>
>+            <typedef-decl name='type' type-id='1dd1da13' filepath='external/libcxx/include/memory' line='1772' column='1' id='e31e7b10'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='__hash_node_types&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='227' column='1' id='3615c46a'>
>+          <base-class access='public' layout-offset-in-bits='0' type-id='26eebbb7'/>
>+          <base-class access='public' layout-offset-in-bits='0' type-id='bfb4a1ac'/>
>+          <member-type access='public'>
>+            <typedef-decl name='__next_pointer' type-id='825761eb' filepath='external/libcxx/include/__hash_table' line='246' column='1' id='0787618a'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='allocator_type' type-id='f4b76f72' filepath='external/libcxx/include/memory' line='1514' column='1' id='b885a1f4'/>
>+            <typedef-decl name='__node_pointer' type-id='42e90df0' filepath='external/libcxx/include/__hash_table' line='240' column='1' id='40ca536f'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='size_type' type-id='1c41d304' filepath='external/libcxx/include/memory' line='1523' column='1' id='e9b1f164'/>
>+            <typedef-decl name='__node_value_type' type-id='68b1ae7f' filepath='external/libcxx/include/__hash_table' line='248' column='1' id='bbe74860'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='const_void_pointer' type-id='caa7dd46' filepath='external/libcxx/include/memory' line='1520' column='1' id='0b1479c6'/>
>+            <typedef-decl name='__node_value_type_pointer' type-id='9efdecf8' filepath='external/libcxx/include/__hash_table' line='250' column='1' id='a0b113d2'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='__hash_key_value_types&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='168' column='1' id='26eebbb7'>
>           <member-type access='public'>
>-            <typedef-decl name='const_pointer' type-id='032e6434' filepath='external/libcxx/include/memory' line='1518' column='1' id='ecfffc93'/>
>+            <typedef-decl name='key_type' type-id='0373e656' filepath='external/libcxx/include/__hash_table' line='169' column='1' id='2b01a7dc'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='rebind_alloc&lt;std::__1::__hash_node&lt;long long, void *&gt; &gt;' type-id='34c3ddfa' filepath='external/libcxx/include/memory' line='1535' column='1' id='32cc66f9'/>
>+            <typedef-decl name='__container_value_type' type-id='b9953957' filepath='external/libcxx/include/__hash_table' line='172' column='1' id='7a9a97d4'/>
>           </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='__node_value_type' type-id='68b1ae7f' filepath='external/libcxx/include/__hash_table' line='171' column='1' id='3112fe3d'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='__map_value_type' type-id='7a9a97d4' filepath='external/libcxx/include/__hash_table' line='173' column='1' id='de388bfb'/>
>+          </member-type>
>+          <data-member access='public' static='yes'>
>+            <var-decl name='__is_map' type-id='4ab96a04' visibility='default' filepath='external/libcxx/include/__hash_table' line='174' column='1'/>
>+          </data-member>
>         </class-decl>
>-        <class-decl name='__pointer_type&lt;long long, std::__1::allocator&lt;long long&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='9705fafe'>
>+        <class-decl name='__hash_map_pointer_types&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *, std::__1::__hash_key_value_types&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='215' column='1' id='bfb4a1ac'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='85033596' filepath='external/libcxx/include/memory' line='1031' column='1' id='b32ceb8b'/>
>+            <typedef-decl name='__map_value_type_pointer' type-id='f812da08' filepath='external/libcxx/include/__hash_table' line='218' column='1' id='eba67fe6'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='allocator&lt;long long&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='f4b76f72'>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='8b97c2dc' filepath='external/libcxx/include/memory' line='1786' column='1' id='b5aa0770'/>
>+        <class-decl name='__rebind_pointer&lt;void *, std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='994' column='1' id='5c25668f'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='0e089b2b' filepath='external/libcxx/include/memory' line='996' column='1' id='f812da08'/>
>           </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='reference' type-id='8f97c928' filepath='external/libcxx/include/memory' line='1788' column='1' id='1dc01ab0'/>
>+        </class-decl>
>+        <class-decl name='__rebind_pointer&lt;void *, std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='994' column='1' id='d9b49353'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='3487cb17' filepath='external/libcxx/include/memory' line='996' column='1' id='9efdecf8'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='pair&lt;std::__1::__hash_iterator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;, bool&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='315' column='1' id='b9e92eaf'>
>+          <data-member access='public' layout-offset-in-bits='0'>
>+            <var-decl name='first' type-id='0da74917' visibility='default' filepath='external/libcxx/include/utility' line='323' column='1'/>
>+          </data-member>
>+          <data-member access='public' layout-offset-in-bits='32'>
>+            <var-decl name='second' type-id='c894953d' visibility='default' filepath='external/libcxx/include/utility' line='324' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='pair' filepath='external/libcxx/include/utility' line='327' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4f1d9177' is-artificial='yes'/>
>+              <parameter type-id='8e54e680'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='pair' filepath='external/libcxx/include/utility' line='328' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4f1d9177' is-artificial='yes'/>
>+              <parameter type-id='5c6e76ef'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='pair&lt;std::__1::__hash_iterator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;, bool &amp;, false&gt;' mangled-name='_ZNSt3__14pairINS_15__hash_iteratorIPNS_11__hash_nodeINS_17__hash_value_typeIP15ASurfaceControl20ASurfaceControlStatsEEPvEEEEbEC2ISB_RbLb0EEEOT_OT0_' filepath='external/libcxx/include/utility' line='447' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='4f1d9177' is-artificial='yes'/>
>+              <parameter type-id='7b296127'/>
>+              <parameter type-id='dce6b981'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='__hash_iterator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/__hash_table' line='283' column='1' id='0da74917'>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='d5203fe9' filepath='external/libcxx/include/memory' line='1787' column='1' id='170f9ba0'/>
>+            <typedef-decl name='__next_pointer' type-id='0787618a' filepath='external/libcxx/include/__hash_table' line='287' column='1' id='04331fc7'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='e12052cd' filepath='external/libcxx/include/memory' line='1789' column='1' id='f124a600'/>
>+            <typedef-decl name='reference' type-id='0036f60d' filepath='external/libcxx/include/__hash_table' line='295' column='1' id='dfcac943'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='a84d11d7'/>
>+            <typedef-decl name='value_type' type-id='bbe74860' filepath='external/libcxx/include/__hash_table' line='293' column='1' id='21b998d0'/>
>           </member-type>
>           <member-type access='private'>
>-            <class-decl name='rebind&lt;std::__1::__hash_node&lt;long long, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1795' column='1' id='2c734053'>
>-              <member-type access='public'>
>-                <typedef-decl name='other' type-id='9b367427' filepath='external/libcxx/include/memory' line='1795' column='1' id='6944dab6'/>
>-              </member-type>
>-            </class-decl>
>+            <typedef-decl name='pointer' type-id='a0b113d2' filepath='external/libcxx/include/__hash_table' line='296' column='1' id='0cc482df'/>
>           </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__node_' type-id='04331fc7' visibility='default' filepath='external/libcxx/include/__hash_table' line='289' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='73445020' is-artificial='yes'/>
>+            <function-decl name='__hash_iterator' filepath='external/libcxx/include/__hash_table' line='298' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='d2a0286f' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='private'>
>+            <function-decl name='__hash_iterator' filepath='external/libcxx/include/__hash_table' line='377' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='d2a0286f' is-artificial='yes'/>
>+              <parameter type-id='04331fc7'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='allocator&lt;std::__1::__hash_node&lt;long long, void *&gt; &gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='9b367427'>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='a4c703fa' filepath='external/libcxx/include/memory' line='1786' column='1' id='4f015deb'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='reference' type-id='98c6f116' filepath='external/libcxx/include/memory' line='1788' column='1' id='394dd73f'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='b3792891' filepath='external/libcxx/include/memory' line='1787' column='1' id='d8b6217b'/>
>+        <class-decl name='conditional&lt;true, std::__1::pair&lt;std::__1::__hash_iterator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;, bool&gt;, std::__1::__nat&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='429' column='1' id='73f6fd3a'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='b9e92eaf' filepath='external/libcxx/include/type_traits' line='429' column='1' id='2fbce54f'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='unique_ptr&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt;, std::__1::__hash_node_destructor&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/memory' line='2401' column='1' id='b7880bd1'>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='af792245' filepath='external/libcxx/include/memory' line='1789' column='1' id='f8e7baef'/>
>+            <typedef-decl name='pointer' type-id='19eadf7a' filepath='external/libcxx/include/memory' line='2405' column='1' id='c56dd9a5'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='45069a4c'/>
>+            <typedef-decl name='deleter_type' type-id='80632042' filepath='external/libcxx/include/memory' line='2404' column='1' id='2f44bc08'/>
>           </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__ptr_' type-id='88a409cb' visibility='default' filepath='external/libcxx/include/memory' line='2411' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='6529161f' is-artificial='yes'/>
>+            <function-decl name='unique_ptr' filepath='external/libcxx/include/memory' line='2494' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='887383c9' is-artificial='yes'/>
>+              <parameter type-id='3cf5fcd1'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public' destructor='yes'>
>+            <function-decl name='~unique_ptr' filepath='external/libcxx/include/memory' line='2606' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='887383c9' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__hash_node&lt;long long, void *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='95' column='1' id='8398d00c'>
>-          <base-class access='public' layout-offset-in-bits='0' type-id='ead7ebd9'/>
>+        <class-decl name='__compressed_pair&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *, std::__1::__hash_node_destructor&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='88a409cb'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='76e2973d'/>
>+          <base-class access='private' layout-offset-in-bits='32' type-id='7fdf9e10'/>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='76e2973d'>
>           <member-type access='public'>
>-            <typedef-decl name='__node_value_type' type-id='1eb56b1e' filepath='external/libcxx/include/__hash_table' line='101' column='1' id='c462da7a'/>
>+            <typedef-decl name='reference' type-id='2ae0c7e2' filepath='external/libcxx/include/memory' line='2136' column='1' id='15987def'/>
>           </member-type>
>-          <data-member access='public' layout-offset-in-bits='32'>
>-            <var-decl name='__hash_' type-id='b59d7dce' visibility='default' filepath='external/libcxx/include/__hash_table' line='103' column='1'/>
>-          </data-member>
>-          <data-member access='public' layout-offset-in-bits='64'>
>-            <var-decl name='__value_' type-id='c462da7a' visibility='default' filepath='external/libcxx/include/__hash_table' line='104' column='1'/>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='53f7a63f' filepath='external/libcxx/include/memory' line='2137' column='1' id='9c9ddbbf'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='42e90df0' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>           </data-member>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='abc5fc9d' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>         </class-decl>
>-        <class-decl name='__hash_node_base&lt;std::__1::__hash_node&lt;long long, void *&gt; *&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='56' column='1' id='ead7ebd9'>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__hash_node_destructor&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt;, 1, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='7fdf9e10'>
>           <member-type access='public'>
>-            <typedef-decl name='__next_pointer' type-id='0ea6cdc7' filepath='external/libcxx/include/__hash_table' line='69' column='1' id='5b3c0e95'/>
>+            <typedef-decl name='reference' type-id='b4173f54' filepath='external/libcxx/include/memory' line='2136' column='1' id='8d357536'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='__node_pointer' type-id='a4c703fa' filepath='external/libcxx/include/__hash_table' line='61' column='1' id='57678b64'/>
>+            <typedef-decl name='const_reference' type-id='83b8874f' filepath='external/libcxx/include/memory' line='2137' column='1' id='cf9f687a'/>
>           </member-type>
>-          <data-member access='public' layout-offset-in-bits='0'>
>-            <var-decl name='__next_' type-id='5b3c0e95' visibility='default' filepath='external/libcxx/include/__hash_table' line='72' column='1'/>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='80632042' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>           </data-member>
>           <member-function access='public'>
>-            <function-decl name='__hash_node_base' filepath='external/libcxx/include/__hash_table' line='91' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='3007d7a1' is-artificial='yes'/>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='b58f6bc6' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='conditional&lt;true, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;long long, void *&gt; *&gt; *, std::__1::__hash_node&lt;long long, void *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='429' column='1' id='3135348c'>
>+        <class-decl name='__hash_node_destructor&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='external/libcxx/include/__hash_table' line='817' column='1' id='80632042'>
>+          <member-type access='private'>
>+            <typedef-decl name='allocator_type' type-id='1b6ff35f' filepath='external/libcxx/include/__hash_table' line='819' column='1' id='1fd57521'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='pointer' type-id='9e2e1478' filepath='external/libcxx/include/__hash_table' line='823' column='1' id='36000438'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__na_' type-id='64bf6152' visibility='default' filepath='external/libcxx/include/__hash_table' line='827' column='1'/>
>+          </data-member>
>+          <data-member access='public' layout-offset-in-bits='32'>
>+            <var-decl name='__value_constructed' type-id='c894953d' visibility='default' filepath='external/libcxx/include/__hash_table' line='832' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='__hash_node_destructor' filepath='external/libcxx/include/__hash_table' line='835' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='a8172c70' is-artificial='yes'/>
>+              <parameter type-id='64bf6152'/>
>+              <parameter type-id='c894953d'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='92e5619a'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='3007d7a1' filepath='external/libcxx/include/type_traits' line='429' column='1' id='0ea6cdc7'/>
>+            <typedef-decl name='pointer' type-id='377bc87b' filepath='external/libcxx/include/memory' line='1517' column='1' id='9e2e1478'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='allocator_type' type-id='1b6ff35f' filepath='external/libcxx/include/memory' line='1514' column='1' id='25e72561'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='size_type' type-id='68a6c5d3' filepath='external/libcxx/include/memory' line='1523' column='1' id='5687aacf'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='const_void_pointer' type-id='1e1f99c2' filepath='external/libcxx/include/memory' line='1520' column='1' id='cfa789bf'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='rebind_alloc&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;' type-id='3bb47b04' filepath='external/libcxx/include/memory' line='1535' column='1' id='cb7d9c2f'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__size_type&lt;std::__1::allocator&lt;long long&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='e93c9eb9'>
>+        <class-decl name='__pointer_type&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt;, std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='24a67318'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='a84d11d7' filepath='external/libcxx/include/memory' line='1171' column='1' id='1c41d304'/>
>+            <typedef-decl name='type' type-id='eb625d48' filepath='external/libcxx/include/memory' line='1031' column='1' id='377bc87b'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__const_void_pointer&lt;long long *, std::__1::allocator&lt;long long&gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='14771957'>
>+        <class-decl name='__size_type&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='31f52a1c'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='3a2b2fa2' filepath='external/libcxx/include/memory' line='1097' column='1' id='caa7dd46'/>
>+            <typedef-decl name='type' type-id='f7b18f8e' filepath='external/libcxx/include/memory' line='1171' column='1' id='68a6c5d3'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='pointer_traits&lt;long long *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='7069b354'>
>+        <class-decl name='__const_void_pointer&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *, std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='cf3699e5'>
>           <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='8b97c2dc' filepath='external/libcxx/include/memory' line='974' column='1' id='d176bc58'/>
>+            <typedef-decl name='type' type-id='da4b99a5' filepath='external/libcxx/include/memory' line='1097' column='1' id='1e1f99c2'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='pointer_traits&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='9ce02653'>
>           <member-type access='public'>
>-            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='3a2b2fa2'/>
>+            <typedef-decl name='pointer' type-id='42e90df0' filepath='external/libcxx/include/memory' line='974' column='1' id='a3b4f87d'/>
>           </member-type>
>           <member-type access='public'>
>-            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='d28456fd'/>
>+            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='da4b99a5'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='1b7997d0'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;long long *&gt;::__nat, long long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='fdac3a68'>
>+        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt;::__nat, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='5845f7ca'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='1eb56b1e' filepath='external/libcxx/include/type_traits' line='431' column='1' id='26e107cf'/>
>+            <typedef-decl name='type' type-id='a18cd1c2' filepath='external/libcxx/include/type_traits' line='431' column='1' id='5b34d527'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__const_pointer&lt;long long, long long *, std::__1::allocator&lt;long long&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1042' column='1' id='26ba2d13'>
>+        <class-decl name='__allocator_traits_rebind&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1280' column='1' id='24052eb7'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='170f9ba0' filepath='external/libcxx/include/memory' line='1044' column='1' id='032e6434'/>
>+            <typedef-decl name='type' type-id='7f342dc2' filepath='external/libcxx/include/memory' line='1282' column='1' id='3bb47b04'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__allocator_traits_rebind&lt;std::__1::allocator&lt;long long&gt;, std::__1::__hash_node&lt;long long, void *&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1280' column='1' id='7f4a3631'>
>+        <class-decl name='add_lvalue_reference&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1127' column='1' id='c1f9aab7'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='6944dab6' filepath='external/libcxx/include/memory' line='1282' column='1' id='34c3ddfa'/>
>+            <typedef-decl name='type' type-id='0579fbeb' filepath='external/libcxx/include/type_traits' line='1128' column='1' id='d92b8ad6'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__compressed_pair&lt;long long *, std::__1::allocator&lt;long long&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='508fa9fe'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='966e6b5a'/>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='15d26f4f'/>
>+        <class-decl name='__add_lvalue_reference_impl&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1125' column='1' id='c4122872'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='4ee920d4' filepath='external/libcxx/include/type_traits' line='1125' column='1' id='0579fbeb'/>
>+          </member-type>
>         </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;long long *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='966e6b5a'>
>+        <class-decl name='__pointer_type&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt;, std::__1::__hash_node_destructor&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='052e7bff'>
>           <member-type access='public'>
>-            <typedef-decl name='reference' type-id='b9e7ef8e' filepath='external/libcxx/include/memory' line='2136' column='1' id='74da06f2'/>
>+            <typedef-decl name='type' type-id='a7e8ad61' filepath='external/libcxx/include/memory' line='1031' column='1' id='19eadf7a'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='__rebind_alloc_helper&lt;std::__1::allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; &gt; &gt;, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1769' column='1' id='fcb5a123'>
>           <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='d99433b3' filepath='external/libcxx/include/memory' line='2137' column='1' id='18634d96'/>
>+            <typedef-decl name='type' type-id='cb7d9c2f' filepath='external/libcxx/include/memory' line='1772' column='1' id='c37f14c6'/>
>+          </member-type>
>+        </class-decl>
>+        <class-decl name='allocator&lt;std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt; &gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='e96ff388'>
>+          <member-type access='private'>
>+            <typedef-decl name='pointer' type-id='ff43352f' filepath='external/libcxx/include/memory' line='1786' column='1' id='782ee496'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='reference' type-id='03433b7b' filepath='external/libcxx/include/memory' line='1788' column='1' id='aed7fc66'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='const_pointer' type-id='53c048a8' filepath='external/libcxx/include/memory' line='1787' column='1' id='239526ba'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='const_reference' type-id='4fc0425c' filepath='external/libcxx/include/memory' line='1789' column='1' id='bc73c58a'/>
>           </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='8b97c2dc' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>-          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='34998e88' is-artificial='yes'/>
>+            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='dc8c978e' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;long long&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='15d26f4f'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='f4b76f72'/>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='7f446304' filepath='external/libcxx/include/memory' line='2174' column='1' id='b3cf67fd'/>
>+        <class-decl name='__hash_map_iterator&lt;std::__1::__hash_iterator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;, void *&gt; *&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/unordered_map' line='736' column='1' id='296bd4f1'>
>+          <member-type access='private'>
>+            <typedef-decl name='reference' type-id='2c7c12ef' filepath='external/libcxx/include/unordered_map' line='746' column='1' id='ef9a1511'/>
>           </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='d3e8ecf7' filepath='external/libcxx/include/memory' line='2175' column='1' id='6cf057f9'/>
>+          <member-type access='private'>
>+            <typedef-decl name='value_type' type-id='de388bfb' filepath='external/libcxx/include/unordered_map' line='744' column='1' id='5f21f9be'/>
>           </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='pointer' type-id='eba67fe6' filepath='external/libcxx/include/unordered_map' line='747' column='1' id='09335da5'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__i_' type-id='0da74917' visibility='default' filepath='external/libcxx/include/unordered_map' line='738' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='7bc04737' is-artificial='yes'/>
>+            <function-decl name='__hash_map_iterator' filepath='external/libcxx/include/unordered_map' line='750' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='a5f16d99' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='__hash_map_iterator' filepath='external/libcxx/include/unordered_map' line='753' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='a5f16d99' is-artificial='yes'/>
>+              <parameter type-id='0da74917'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='vector&lt;unsigned long long, std::__1::allocator&lt;unsigned long long&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='2d13208f'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='fd1a2199'/>
>+        <typedef-decl name='__map_node_handle&lt;std::__1::unordered_map&lt;ASurfaceControl *, ASurfaceControlStats, std::__1::hash&lt;ASurfaceControl *&gt;, std::__1::equal_to&lt;ASurfaceControl *&gt;, std::__1::allocator&lt;std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt; &gt; &gt;::__node, std::__1::unordered_map&lt;ASurfaceControl *, ASurfaceControlStats, std::__1::hash&lt;ASurfaceControl *&gt;, std::__1::equal_to&lt;ASurfaceControl *&gt;, std::__1::allocator&lt;std::__1::pair&lt;ASurfaceControl *const, ASurfaceControlStats&gt; &gt; &gt;::allocator_type&gt;' type-id='0a0baf19' filepath='external/libcxx/include/__node_handle' line='193' column='1' id='82c88fb2'/>
>+        <class-decl name='vector&lt;unsigned char, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='b05cdcb7'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='d5b8afe1'/>
>           <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='d83d0edf' filepath='external/libcxx/include/vector' line='479' column='1' id='c8801c48'/>
>+            <typedef-decl name='allocator_type' type-id='28ac9f25' filepath='external/libcxx/include/vector' line='479' column='1' id='61c54ac4'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='5f167a8c' filepath='external/libcxx/include/vector' line='483' column='1' id='02ffc270'/>
>+            <typedef-decl name='size_type' type-id='26dd3530' filepath='external/libcxx/include/vector' line='483' column='1' id='d5277a54'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='3a47d82b' filepath='external/libcxx/include/vector' line='478' column='1' id='b4e634f0'/>
>+            <typedef-decl name='value_type' type-id='002ac4a6' filepath='external/libcxx/include/vector' line='478' column='1' id='58b97fd4'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='9ea2182f' filepath='external/libcxx/include/vector' line='482' column='1' id='d662e673'/>
>+            <typedef-decl name='const_reference' type-id='8b583b33' filepath='external/libcxx/include/vector' line='482' column='1' id='b7731497'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='998e238d' filepath='external/libcxx/include/vector' line='487' column='1' id='81f2f90c'/>
>+            <typedef-decl name='iterator' type-id='68fdf037' filepath='external/libcxx/include/vector' line='487' column='1' id='b239ece8'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='82d2f516' filepath='external/libcxx/include/vector' line='488' column='1' id='1a75b53c'/>
>+            <typedef-decl name='const_iterator' type-id='5ec92c0a' filepath='external/libcxx/include/vector' line='488' column='1' id='35ddcf48'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reverse_iterator' type-id='83076282' filepath='external/libcxx/include/vector' line='489' column='1' id='c7ab0ebf'/>
>+            <typedef-decl name='reverse_iterator' type-id='b0b63972' filepath='external/libcxx/include/vector' line='489' column='1' id='ef32aa33'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reverse_iterator' type-id='8ae647e9' filepath='external/libcxx/include/vector' line='490' column='1' id='5bd8044f'/>
>+            <typedef-decl name='const_reverse_iterator' type-id='5f2bceeb' filepath='external/libcxx/include/vector' line='490' column='1' id='88519a53'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='3796997f' filepath='external/libcxx/include/vector' line='481' column='1' id='d7aaab23'/>
>+            <typedef-decl name='reference' type-id='35ba8be3' filepath='external/libcxx/include/vector' line='481' column='1' id='374cd9b7'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='bae2992b' filepath='external/libcxx/include/vector' line='485' column='1' id='29f224bf'/>
>+            <typedef-decl name='pointer' type-id='c59bbd7f' filepath='external/libcxx/include/vector' line='485' column='1' id='628edda3'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='89bd90bb' filepath='external/libcxx/include/vector' line='486' column='1' id='ca75396f'/>
>+            <typedef-decl name='const_pointer' type-id='413a012f' filepath='external/libcxx/include/vector' line='486' column='1' id='9da97f83'/>
>           </member-type>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='496' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='502' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='1187bf3a'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='f6694716'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='514' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='02ffc270'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='d5277a54'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='516' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='02ffc270'/>
>-              <parameter type-id='1187bf3a'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='d5277a54'/>
>+              <parameter type-id='f6694716'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='518' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='02ffc270'/>
>-              <parameter type-id='430726b2'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='d5277a54'/>
>+              <parameter type-id='63e62b06'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='519' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='02ffc270'/>
>-              <parameter type-id='430726b2'/>
>-              <parameter type-id='1187bf3a'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='d5277a54'/>
>+              <parameter type-id='63e62b06'/>
>+              <parameter type-id='f6694716'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public' destructor='yes'>
>-            <function-decl name='~vector' filepath='external/libcxx/include/vector' line='550' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>+            <function-decl name='~vector' mangled-name='_ZNSt3__16vectorIhNS_9allocatorIhEEED2Ev' filepath='external/libcxx/include/vector' line='550' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='558' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='8c60215c'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='bf3fae58'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='559' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='8c60215c'/>
>-              <parameter type-id='1187bf3a'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='bf3fae58'/>
>+              <parameter type-id='f6694716'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='565' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='fa76a338'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='8723cba4'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='568' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='fa76a338'/>
>-              <parameter type-id='1187bf3a'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='8723cba4'/>
>+              <parameter type-id='f6694716'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='571' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='e367418f'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='22a84077'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>             <function-decl name='vector' filepath='external/libcxx/include/vector' line='579' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='b712c097' is-artificial='yes'/>
>-              <parameter type-id='e367418f'/>
>-              <parameter type-id='1187bf3a'/>
>+              <parameter type-id='94829ddf' is-artificial='yes'/>
>+              <parameter type-id='22a84077'/>
>+              <parameter type-id='f6694716'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__vector_base&lt;unsigned long long, std::__1::allocator&lt;unsigned long long&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='326' column='1' id='fd1a2199'>
>-          <base-class access='protected' layout-offset-in-bits='0' type-id='2328d49c'/>
>+        <class-decl name='unordered_map&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState, android::SurfaceComposerClient::SCHash, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, std::__1::allocator&lt;std::__1::pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/unordered_map' line='842' column='1' id='b5996dd6'>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='ce555438' filepath='external/libcxx/include/vector' line='338' column='1' id='bae2992b'/>
>+            <typedef-decl name='__table' type-id='0fcd7eac' filepath='external/libcxx/include/unordered_map' line='866' column='1' id='7fcc176d'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='d83d0edf' filepath='external/libcxx/include/vector' line='330' column='1' id='9121a78c'/>
>+            <typedef-decl name='size_type' type-id='5fb1fd5f' filepath='external/libcxx/include/unordered_map' line='885' column='1' id='39044a49'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='f5c6c28f' filepath='external/libcxx/include/vector' line='332' column='1' id='5f167a8c'/>
>+            <typedef-decl name='hasher' type-id='52d5d590' filepath='external/libcxx/include/unordered_map' line='848' column='1' id='ea42aa52'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='82d1ba4e' filepath='external/libcxx/include/vector' line='336' column='1' id='9ea2182f'/>
>+            <typedef-decl name='key_equal' type-id='3e463dcc' filepath='external/libcxx/include/unordered_map' line='849' column='1' id='512d62bb'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='3a47d82b' filepath='external/libcxx/include/vector' line='334' column='1' id='44ddaacc'/>
>+            <typedef-decl name='allocator_type' type-id='c6fe9052' filepath='external/libcxx/include/unordered_map' line='850' column='1' id='3b4464f7'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='806e3c57' filepath='external/libcxx/include/vector' line='335' column='1' id='3796997f'/>
>+            <typedef-decl name='iterator' type-id='727a2ce7' filepath='external/libcxx/include/unordered_map' line='888' column='1' id='bb9a24f7'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='37063d58' filepath='external/libcxx/include/vector' line='339' column='1' id='89bd90bb'/>
>+            <typedef-decl name='const_iterator' type-id='7a4acb43' filepath='external/libcxx/include/unordered_map' line='889' column='1' id='7b9c8023'/>
>           </member-type>
>-          <data-member access='protected' layout-offset-in-bits='0'>
>-            <var-decl name='__begin_' type-id='bae2992b' visibility='default' filepath='external/libcxx/include/vector' line='343' column='1'/>
>-          </data-member>
>-          <data-member access='protected' layout-offset-in-bits='32'>
>-            <var-decl name='__end_' type-id='bae2992b' visibility='default' filepath='external/libcxx/include/vector' line='344' column='1'/>
>-          </data-member>
>-          <data-member access='protected' layout-offset-in-bits='64'>
>-            <var-decl name='__end_cap_' type-id='717aadd4' visibility='default' filepath='external/libcxx/include/vector' line='345' column='1'/>
>-          </data-member>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='361' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fe86fc1' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='363' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fe86fc1' is-artificial='yes'/>
>-              <parameter type-id='043599ce'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='protected'>
>-            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='365' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fe86fc1' is-artificial='yes'/>
>-              <parameter type-id='d59335e3'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='protected' destructor='yes'>
>-            <function-decl name='~__vector_base' filepath='external/libcxx/include/vector' line='367' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fe86fc1' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-        </class-decl>
>-        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;unsigned long long&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='e8c0df76'>
>-          <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='55dfa9b1' filepath='external/libcxx/include/memory' line='1517' column='1' id='ce555438'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='allocator_type' type-id='d83d0edf' filepath='external/libcxx/include/memory' line='1514' column='1' id='b43ae521'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='size_type' type-id='6bbc2737' filepath='external/libcxx/include/memory' line='1523' column='1' id='f5c6c28f'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_void_pointer' type-id='2c6ccd48' filepath='external/libcxx/include/memory' line='1520' column='1' id='6ae7ba7f'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_pointer' type-id='e46f3243' filepath='external/libcxx/include/memory' line='1518' column='1' id='37063d58'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='__pointer_type&lt;unsigned long long, std::__1::allocator&lt;unsigned long long&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='a889b844'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='cddfc65c' filepath='external/libcxx/include/memory' line='1031' column='1' id='55dfa9b1'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='allocator&lt;unsigned long long&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='d83d0edf'>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='c0190993' filepath='external/libcxx/include/memory' line='1786' column='1' id='1e7d2591'/>
>+            <typedef-decl name='value_type' type-id='e0bee049' filepath='external/libcxx/include/unordered_map' line='851' column='1' id='c31d6a4f'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='cc191c77' filepath='external/libcxx/include/memory' line='1788' column='1' id='7a3ce72d'/>
>+            <typedef-decl name='key_type' type-id='3d05d53e' filepath='external/libcxx/include/unordered_map' line='846' column='1' id='9fbda7c9'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='b6e600bc' filepath='external/libcxx/include/memory' line='1787' column='1' id='2a7b80bd'/>
>+            <typedef-decl name='insert_return_type' type-id='b14a07f8' filepath='external/libcxx/include/unordered_map' line='895' column='1' id='dc518940'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='bae60708' filepath='external/libcxx/include/memory' line='1789' column='1' id='0bc22d89'/>
>+            <typedef-decl name='node_type' type-id='cd19729a' filepath='external/libcxx/include/unordered_map' line='894' column='1' id='397c0a7e'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='6fe401da'/>
>+            <typedef-decl name='mapped_type' type-id='d684da9f' filepath='external/libcxx/include/unordered_map' line='847' column='1' id='ade42637'/>
>           </member-type>
>-          <member-function access='public'>
>-            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='5ac82287' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-        </class-decl>
>-        <class-decl name='unique_ptr&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::default_delete&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2401' column='1' id='ee11ffd6'>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='538091a9' filepath='external/libcxx/include/memory' line='2405' column='1' id='0136fab8'/>
>+            <typedef-decl name='local_iterator' type-id='47d846d7' filepath='external/libcxx/include/unordered_map' line='890' column='1' id='15c05647'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='deleter_type' type-id='523e1257' filepath='external/libcxx/include/memory' line='2404' column='1' id='87233a23'/>
>+            <typedef-decl name='const_local_iterator' type-id='c947f453' filepath='external/libcxx/include/unordered_map' line='891' column='1' id='a8995e13'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__ptr_' type-id='dc8bc990' visibility='default' filepath='external/libcxx/include/memory' line='2411' column='1'/>
>+            <var-decl name='__table_' type-id='7fcc176d' visibility='default' filepath='external/libcxx/include/unordered_map' line='868' column='1'/>
>           </data-member>
>           <member-function access='public'>
>-            <function-decl name='unique_ptr' filepath='external/libcxx/include/memory' line='2494' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='7d0d8c7c' is-artificial='yes'/>
>-              <parameter type-id='165e4caa'/>
>+            <function-decl name='unordered_map' mangled-name='_ZNSt3__113unordered_mapIN7android2spINS1_14SurfaceControlEEENS1_13ComposerStateENS1_21SurfaceComposerClient6SCHashENS_8equal_toIS4_EENS_9allocatorINS_4pairIKS4_S5_EEEEEC2Ev' filepath='external/libcxx/include/unordered_map' line='904' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-          <member-function access='public' destructor='yes'>
>-            <function-decl name='~unique_ptr' mangled-name='_ZNSt3__110unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS6_EEED2Ev' filepath='external/libcxx/include/memory' line='2606' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='7d0d8c7c' is-artificial='yes'/>
>+          <member-function access='public'>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='911' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='046291ac'/>
>+              <parameter type-id='db8e5857'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unique_ptr&lt;true, void&gt;' mangled-name='_ZNSt3__110unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS6_EEEC2ILb1EvEEv' filepath='external/libcxx/include/memory' line='2461' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='7d0d8c7c' is-artificial='yes'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='913' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='046291ac'/>
>+              <parameter type-id='db8e5857'/>
>+              <parameter type-id='2cbe6893'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__size_type&lt;std::__1::allocator&lt;unsigned long long&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='a7854c3c'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='6fe401da' filepath='external/libcxx/include/memory' line='1171' column='1' id='6bbc2737'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='__const_void_pointer&lt;unsigned long long *, std::__1::allocator&lt;unsigned long long&gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='ee93ceed'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='1021a481' filepath='external/libcxx/include/memory' line='1097' column='1' id='2c6ccd48'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='pointer_traits&lt;unsigned long long *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='c5ae51e1'>
>-          <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='c0190993' filepath='external/libcxx/include/memory' line='974' column='1' id='77e8baa9'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='1021a481'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='51725c56'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;unsigned long long *&gt;::__nat, unsigned long long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='1e2f015e'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='3a47d82b' filepath='external/libcxx/include/type_traits' line='431' column='1' id='3e34c66d'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='__const_pointer&lt;unsigned long long, unsigned long long *, std::__1::allocator&lt;unsigned long long&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1042' column='1' id='d401f1a2'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='2a7b80bd' filepath='external/libcxx/include/memory' line='1044' column='1' id='e46f3243'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='__compressed_pair&lt;unsigned long long *, std::__1::allocator&lt;unsigned long long&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='717aadd4'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='766bcfe9'/>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='67f27ed6'/>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;unsigned long long *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='766bcfe9'>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='1c6a47ef' filepath='external/libcxx/include/memory' line='2136' column='1' id='8d7dd3cd'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='0399a00a' filepath='external/libcxx/include/memory' line='2137' column='1' id='489e6869'/>
>-          </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='c0190993' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>-          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='81dc4c31' is-artificial='yes'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='928' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='2cbe6893'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;unsigned long long&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='67f27ed6'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='d83d0edf'/>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='4ec80fa3' filepath='external/libcxx/include/memory' line='2174' column='1' id='a1aeb63c'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='eb7e6586' filepath='external/libcxx/include/memory' line='2175' column='1' id='6130aedc'/>
>-          </member-type>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c744092c' is-artificial='yes'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='929' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='a2fe3a71'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='conditional&lt;false, std::__1::pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::__nat&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='217630b5'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='13623784' filepath='external/libcxx/include/type_traits' line='431' column='1' id='0c09b952'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt;, 1, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='d5807ece'>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='9119af4e' filepath='external/libcxx/include/memory' line='2136' column='1' id='595ec376'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='c013bcef' filepath='external/libcxx/include/memory' line='2137' column='1' id='fa7437ba'/>
>-          </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='a1475884' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>-          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' mangled-name='_ZNSt3__122__compressed_pair_elemINS_25__bucket_list_deallocatorINS_9allocatorIPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS6_14SurfaceControlEEENS6_13ComposerStateEEEPvEEEEEEEELi1ELb0EEC2Ev' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='0631e764' is-artificial='yes'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='930' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='a2fe3a71'/>
>+              <parameter type-id='2cbe6893'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/__hash_table' line='767' column='1' id='a1475884'>
>-          <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='b9a0490e' filepath='external/libcxx/include/__hash_table' line='769' column='1' id='e4519ea1'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='8cfd7e14' filepath='external/libcxx/include/__hash_table' line='771' column='1' id='a4330b0f'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='6d270963' filepath='external/libcxx/include/__hash_table' line='775' column='1' id='ac6148b8'/>
>-          </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__data_' type-id='19161bd8' visibility='default' filepath='external/libcxx/include/__hash_table' line='773' column='1'/>
>-          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__bucket_list_deallocator' mangled-name='_ZNSt3__125__bucket_list_deallocatorINS_9allocatorIPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS5_14SurfaceControlEEENS5_13ComposerStateEEEPvEEEEEEEC2Ev' filepath='external/libcxx/include/__hash_table' line='778' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='8d19a902' is-artificial='yes'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='933' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='97fc736a'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='__bucket_list_deallocator' filepath='external/libcxx/include/__hash_table' line='783' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='8d19a902' is-artificial='yes'/>
>-              <parameter type-id='3f460955'/>
>-              <parameter type-id='a4330b0f'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='935' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='97fc736a'/>
>+              <parameter type-id='2cbe6893'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='__bucket_list_deallocator' filepath='external/libcxx/include/__hash_table' line='789' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='8d19a902' is-artificial='yes'/>
>-              <parameter type-id='d36f20b8'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='936' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='840c594b'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair&lt;unsigned int, std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='19161bd8'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='8051cbec'/>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='4674ef3f'/>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair&lt;int, true&gt;' mangled-name='_ZNSt3__117__compressed_pairIjNS_9allocatorIPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS5_14SurfaceControlEEENS5_13ComposerStateEEEPvEEEEEEEC2IiLb1EEEOT_' filepath='external/libcxx/include/memory' line='2240' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='1fd4915e' is-artificial='yes'/>
>-              <parameter type-id='75f9e64a'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='937' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='840c594b'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='046291ac'/>
>+              <parameter type-id='db8e5857'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='4674ef3f'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='b9a0490e'/>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='d40473f0' filepath='external/libcxx/include/memory' line='2174' column='1' id='56dc2cf7'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='2e5a4bc9' filepath='external/libcxx/include/memory' line='2175' column='1' id='2d677bd7'/>
>-          </member-type>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9710e377' is-artificial='yes'/>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='939' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='840c594b'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='046291ac'/>
>+              <parameter type-id='db8e5857'/>
>+              <parameter type-id='2cbe6893'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='945' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='2cbe6893'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='948' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='046291ac'/>
>+              <parameter type-id='2cbe6893'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='960' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='840c594b'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='2cbe6893'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='963' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='571a02bc' is-artificial='yes'/>
>+              <parameter type-id='840c594b'/>
>+              <parameter type-id='39044a49'/>
>+              <parameter type-id='046291ac'/>
>+              <parameter type-id='2cbe6893'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='b9a0490e'>
>+        <class-decl name='__hash_table&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::__unordered_map_hasher&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, android::SurfaceComposerClient::SCHash, true&gt;, std::__1::__unordered_map_equal&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, true&gt;, std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/__hash_table' line='893' column='1' id='0fcd7eac'>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='97cfbb03' filepath='external/libcxx/include/memory' line='1786' column='1' id='c066511a'/>
>+            <typedef-decl name='__bucket_list' type-id='3c8048f0' filepath='external/libcxx/include/__hash_table' line='950' column='1' id='3db3a374'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='a3cfcde7' filepath='external/libcxx/include/memory' line='1788' column='1' id='ac05b7ea'/>
>+            <typedef-decl name='size_type' type-id='4df509ee' filepath='external/libcxx/include/__hash_table' line='916' column='1' id='5fb1fd5f'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='afabcbae' filepath='external/libcxx/include/memory' line='1787' column='1' id='7d4ada2e'/>
>+            <typedef-decl name='hasher' type-id='25a1429c' filepath='external/libcxx/include/__hash_table' line='897' column='1' id='3929eec0'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='ababc562' filepath='external/libcxx/include/memory' line='1789' column='1' id='9f9c819e'/>
>+            <typedef-decl name='key_equal' type-id='8567fb19' filepath='external/libcxx/include/__hash_table' line='898' column='1' id='e4d702a5'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='6f743741'/>
>-          </member-type>
>-          <member-function access='public'>
>-            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='e00486d4' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-        </class-decl>
>-        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='261261e3'>
>-          <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='f49b2285' filepath='external/libcxx/include/memory' line='1517' column='1' id='6d270963'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='allocator_type' type-id='b9a0490e' filepath='external/libcxx/include/memory' line='1514' column='1' id='9cda4084'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='size_type' type-id='988235fe' filepath='external/libcxx/include/memory' line='1523' column='1' id='8cfd7e14'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_void_pointer' type-id='774c29f4' filepath='external/libcxx/include/memory' line='1520' column='1' id='b80c6716'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='__pointer_type&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *, std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='b5af63e0'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='99a00100' filepath='external/libcxx/include/memory' line='1031' column='1' id='f49b2285'/>
>-          </member-type>
>-        </class-decl>
>-        <class-decl name='__size_type&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='a4b93c99'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='6f743741' filepath='external/libcxx/include/memory' line='1171' column='1' id='988235fe'/>
>+            <typedef-decl name='__node_allocator' type-id='6e3b05fe' filepath='external/libcxx/include/__hash_table' line='925' column='1' id='eb3dee6b'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='__const_void_pointer&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **, std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='cde2067b'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='c638ad2e' filepath='external/libcxx/include/memory' line='1097' column='1' id='774c29f4'/>
>+          <member-type access='private'>
>+            <typedef-decl name='allocator_type' type-id='eaedaeb4' filepath='external/libcxx/include/__hash_table' line='899' column='1' id='9f9d6391'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='pointer_traits&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='51e806f8'>
>-          <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='97cfbb03' filepath='external/libcxx/include/memory' line='974' column='1' id='c4014214'/>
>+          <member-type access='private'>
>+            <typedef-decl name='__next_pointer' type-id='4922730c' filepath='external/libcxx/include/__hash_table' line='932' column='1' id='34dbc4c6'/>
>           </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='c638ad2e'/>
>+          <member-type access='private'>
>+            <typedef-decl name='value_type' type-id='21a2c439' filepath='external/libcxx/include/__hash_table' line='896' column='1' id='f62f5ba5'/>
>           </member-type>
>-          <member-type access='public'>
>-            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='e8e19539'/>
>+          <member-type access='private'>
>+            <typedef-decl name='__node_pointer' type-id='e54a60cd' filepath='external/libcxx/include/__hash_table' line='928' column='1' id='4ba10a93'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **&gt;::__nat, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='8a2f685c'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='ad4706fb' filepath='external/libcxx/include/type_traits' line='431' column='1' id='72f6ea15'/>
>+          <member-type access='private'>
>+            <typedef-decl name='iterator' type-id='e0800591' filepath='external/libcxx/include/__hash_table' line='989' column='1' id='1cc568d9'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='add_lvalue_reference&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1127' column='1' id='171d1696'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='0f635d3c' filepath='external/libcxx/include/type_traits' line='1128' column='1' id='20578b27'/>
>+          <member-type access='private'>
>+            <typedef-decl name='const_iterator' type-id='cc09c171' filepath='external/libcxx/include/__hash_table' line='990' column='1' id='447f3659'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='__add_lvalue_reference_impl&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='1125' column='1' id='8f3b7ac3'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='a3cfcde7' filepath='external/libcxx/include/type_traits' line='1125' column='1' id='0f635d3c'/>
>+          <member-type access='private'>
>+            <typedef-decl name='__container_value_type' type-id='ae15c6d0' filepath='external/libcxx/include/__hash_table' line='909' column='1' id='87bfa8ab'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='__pointer_type&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *, std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='de57594a'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='dbea275a' filepath='external/libcxx/include/memory' line='1031' column='1' id='341da367'/>
>+          <member-type access='private'>
>+            <typedef-decl name='__node_holder' type-id='6370122f' filepath='external/libcxx/include/__hash_table' line='1232' column='1' id='efadd628'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt;, std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; &gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='9019f6a3'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='4fe3e724'/>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='6668eab0'/>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt;, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='4fe3e724'>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='a94700af' filepath='external/libcxx/include/memory' line='2136' column='1' id='2a8fbdbe'/>
>+          <member-type access='private'>
>+            <typedef-decl name='local_iterator' type-id='a58f61e1' filepath='external/libcxx/include/__hash_table' line='991' column='1' id='fcf150bd'/>
>           </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='9c7d21dc' filepath='external/libcxx/include/memory' line='2137' column='1' id='0a383052'/>
>+          <member-type access='private'>
>+            <typedef-decl name='const_local_iterator' type-id='2133bd01' filepath='external/libcxx/include/__hash_table' line='992' column='1' id='2170b23d'/>
>           </member-type>
>           <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__value_' type-id='8a3fab4b' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+            <var-decl name='__bucket_list_' type-id='3db3a374' visibility='default' filepath='external/libcxx/include/__hash_table' line='955' column='1'/>
>+          </data-member>
>+          <data-member access='private' layout-offset-in-bits='64'>
>+            <var-decl name='__p1_' type-id='9019f6a3' visibility='default' filepath='external/libcxx/include/__hash_table' line='956' column='1'/>
>+          </data-member>
>+          <data-member access='private' layout-offset-in-bits='96'>
>+            <var-decl name='__p2_' type-id='48ffebb2' visibility='default' filepath='external/libcxx/include/__hash_table' line='957' column='1'/>
>+          </data-member>
>+          <data-member access='private' layout-offset-in-bits='128'>
>+            <var-decl name='__p3_' type-id='7891cba1' visibility='default' filepath='external/libcxx/include/__hash_table' line='958' column='1'/>
>           </data-member>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='317ef0d2' is-artificial='yes'/>
>+            <function-decl name='__hash_table' mangled-name='_ZNSt3__112__hash_tableINS_17__hash_value_typeIN7android2spINS2_14SurfaceControlEEENS2_13ComposerStateEEENS_22__unordered_map_hasherIS5_S7_NS2_21SurfaceComposerClient6SCHashELb1EEENS_21__unordered_map_equalIS5_S7_NS_8equal_toIS5_EELb1EEENS_9allocatorIS7_EEEC2Ev' filepath='external/libcxx/include/__hash_table' line='995' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; &gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='6668eab0'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='899220a9'/>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='178a20e5' filepath='external/libcxx/include/memory' line='2174' column='1' id='58ac43ac'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='63030cd6' filepath='external/libcxx/include/memory' line='2175' column='1' id='019170ec'/>
>-          </member-type>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='133d0606' is-artificial='yes'/>
>+            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1003' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>+              <parameter type-id='44cd9842'/>
>+              <parameter type-id='c96c9f49'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='allocator&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; &gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='899220a9'>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='f132d3c4' filepath='external/libcxx/include/memory' line='1786' column='1' id='1c260141'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='reference' type-id='e532c0e0' filepath='external/libcxx/include/memory' line='1788' column='1' id='7c16867d'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='a5cf64ff' filepath='external/libcxx/include/memory' line='1787' column='1' id='bffcfc0d'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='a9cf6b4b' filepath='external/libcxx/include/memory' line='1789' column='1' id='f90a8279'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='09bd44aa'/>
>-          </member-type>
>           <member-function access='public'>
>-            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='1b8a2731' is-artificial='yes'/>
>+            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1004' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>+              <parameter type-id='44cd9842'/>
>+              <parameter type-id='c96c9f49'/>
>+              <parameter type-id='26de8845'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair&lt;unsigned int, std::__1::__unordered_map_hasher&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, android::SurfaceComposerClient::SCHash, true&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='48ffebb2'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='8051cbec'/>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='1a4d1781'/>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::__unordered_map_hasher&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, android::SurfaceComposerClient::SCHash, true&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='1a4d1781'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='25a1429c'/>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='59c88246' filepath='external/libcxx/include/memory' line='2174' column='1' id='bcfcfeed'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='cae9efb7' filepath='external/libcxx/include/memory' line='2175' column='1' id='6d836949'/>
>-          </member-type>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='7ab87bb9' is-artificial='yes'/>
>+            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1006' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>+              <parameter type-id='26de8845'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__unordered_map_hasher&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, android::SurfaceComposerClient::SCHash, true&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/unordered_map' line='425' column='1' id='25a1429c'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='52d5d590'/>
>           <member-function access='public'>
>-            <function-decl name='__unordered_map_hasher' filepath='external/libcxx/include/unordered_map' line='430' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='65c8952a' is-artificial='yes'/>
>+            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1007' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>+              <parameter type-id='f46f0b9f'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='__unordered_map_hasher' filepath='external/libcxx/include/unordered_map' line='434' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='65c8952a' is-artificial='yes'/>
>-              <parameter type-id='9f3483b1'/>
>+            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1008' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>+              <parameter type-id='f46f0b9f'/>
>+              <parameter type-id='26de8845'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair&lt;float, std::__1::__unordered_map_equal&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, true&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='7891cba1'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='9884ef0e'/>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='796f3cb4'/>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair&lt;float, true&gt;' mangled-name='_ZNSt3__117__compressed_pairIfNS_21__unordered_map_equalIN7android2spINS2_14SurfaceControlEEENS_17__hash_value_typeIS5_NS2_13ComposerStateEEENS_8equal_toIS5_EELb1EEEEC2IfLb1EEEOT_' filepath='external/libcxx/include/memory' line='2240' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='f05c0069' is-artificial='yes'/>
>-              <parameter type-id='0e7051ad'/>
>+            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1010' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>+              <parameter type-id='2a485110'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__compressed_pair_elem&lt;std::__1::__unordered_map_equal&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, true&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='796f3cb4'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='8567fb19'/>
>-          <member-type access='public'>
>-            <typedef-decl name='reference' type-id='3577f555' filepath='external/libcxx/include/memory' line='2174' column='1' id='d55cc632'/>
>-          </member-type>
>-          <member-type access='public'>
>-            <typedef-decl name='const_reference' type-id='7fafe724' filepath='external/libcxx/include/memory' line='2175' column='1' id='2452ddd6'/>
>-          </member-type>
>           <member-function access='public'>
>-            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c90e5fb2' is-artificial='yes'/>
>+            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1017' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>+              <parameter type-id='2a485110'/>
>+              <parameter type-id='26de8845'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-        </class-decl>
>-        <class-decl name='__unordered_map_equal&lt;android::sp&lt;android::SurfaceControl&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, true&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/unordered_map' line='494' column='1' id='8567fb19'>
>-          <base-class access='private' layout-offset-in-bits='0' type-id='3e463dcc'/>
>-          <member-function access='public'>
>-            <function-decl name='__unordered_map_equal' filepath='external/libcxx/include/unordered_map' line='499' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='3977fba1' is-artificial='yes'/>
>+          <member-function access='public' destructor='yes'>
>+            <function-decl name='~__hash_table' mangled-name='_ZNSt3__112__hash_tableINS_17__hash_value_typeIN7android2spINS2_14SurfaceControlEEENS2_13ComposerStateEEENS_22__unordered_map_hasherIS5_S7_NS2_21SurfaceComposerClient6SCHashELb1EEENS_21__unordered_map_equalIS5_S7_NS_8equal_toIS5_EELb1EEENS_9allocatorIS7_EEED2Ev' filepath='external/libcxx/include/__hash_table' line='1019' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='9111677a' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>+        </class-decl>
>+        <class-decl name='unique_ptr&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *[], std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='external/libcxx/include/memory' line='2663' column='1' id='3c8048f0'>
>+          <member-type access='private'>
>+            <typedef-decl name='pointer' type-id='341da367' filepath='external/libcxx/include/memory' line='2667' column='1' id='0b5df532'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='deleter_type' type-id='a1475884' filepath='external/libcxx/include/memory' line='2666' column='1' id='c86d43f5'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__ptr_' type-id='0637ec34' visibility='default' filepath='external/libcxx/include/memory' line='2670' column='1'/>
>+          </data-member>
>           <member-function access='public'>
>-            <function-decl name='__unordered_map_equal' filepath='external/libcxx/include/unordered_map' line='503' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='3977fba1' is-artificial='yes'/>
>-              <parameter type-id='1c66c767'/>
>+            <function-decl name='unique_ptr' filepath='external/libcxx/include/memory' line='2791' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='cc031436' is-artificial='yes'/>
>+              <parameter type-id='48f6c374'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public' destructor='yes'>
>+            <function-decl name='~unique_ptr' mangled-name='_ZNSt3__110unique_ptrIA_PNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS4_14SurfaceControlEEENS4_13ComposerStateEEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISE_EEEEED2Ev' filepath='external/libcxx/include/memory' line='2887' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='cc031436' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unique_ptr&lt;true, void&gt;' mangled-name='_ZNSt3__110unique_ptrIA_PNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS4_14SurfaceControlEEENS4_13ComposerStateEEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISE_EEEEEC2ILb1EvEEv' filepath='external/libcxx/include/memory' line='2738' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='cc031436' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/functional' line='674' column='1' id='3e463dcc'>
>-          <base-class access='public' layout-offset-in-bits='0' type-id='2137cba5'/>
>-        </class-decl>
>-        <class-decl name='binary_function&lt;android::sp&lt;android::SurfaceControl&gt;, android::sp&lt;android::SurfaceControl&gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__functional_base' line='28' column='1' id='2137cba5'/>
>-        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='45c27ab1'>
>+        <class-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **, std::__1::__bucket_list_deallocator&lt;std::__1::allocator&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='0637ec34'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='a8506f96'/>
>+          <base-class access='private' layout-offset-in-bits='32' type-id='d5807ece'/>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **, true&gt;' mangled-name='_ZNSt3__117__compressed_pairIPPNS_16__hash_node_baseIPNS_11__hash_nodeINS_17__hash_value_typeIN7android2spINS4_14SurfaceControlEEENS4_13ComposerStateEEEPvEEEENS_25__bucket_list_deallocatorINS_9allocatorISE_EEEEEC2ISF_Lb1EEEOT_' filepath='external/libcxx/include/memory' line='2240' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='0cf96682' is-artificial='yes'/>
>+              <parameter type-id='11ad285b'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; **, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='a8506f96'>
>           <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='3d28dad9' filepath='external/libcxx/include/memory' line='1517' column='1' id='37459415'/>
>+            <typedef-decl name='reference' type-id='21039b3f' filepath='external/libcxx/include/memory' line='2136' column='1' id='7f802666'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='allocator_type' type-id='eaedaeb4' filepath='external/libcxx/include/memory' line='1514' column='1' id='f5043cca'/>
>+            <typedef-decl name='const_reference' type-id='f2b2449a' filepath='external/libcxx/include/memory' line='2137' column='1' id='e28a9f8a'/>
>           </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__value_' type-id='97cfbb03' visibility='default' filepath='external/libcxx/include/memory' line='2168' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2140' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='e84ff04c' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='56' column='1' id='8a3fab4b'>
>           <member-type access='public'>
>-            <typedef-decl name='size_type' type-id='034ebaec' filepath='external/libcxx/include/memory' line='1523' column='1' id='4df509ee'/>
>+            <typedef-decl name='__next_pointer' type-id='cc6db4eb' filepath='external/libcxx/include/__hash_table' line='69' column='1' id='f0c35ac7'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='const_void_pointer' type-id='b01256e0' filepath='external/libcxx/include/memory' line='1520' column='1' id='c4d41f9c'/>
>+            <typedef-decl name='__node_pointer' type-id='f132d3c4' filepath='external/libcxx/include/__hash_table' line='61' column='1' id='15f864ea'/>
>           </member-type>
>+          <data-member access='public' layout-offset-in-bits='0'>
>+            <var-decl name='__next_' type-id='f0c35ac7' visibility='default' filepath='external/libcxx/include/__hash_table' line='72' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='__hash_node_base' filepath='external/libcxx/include/__hash_table' line='91' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='ad4706fb' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='conditional&lt;true, std::__1::__hash_node_base&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt; *, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='429' column='1' id='f581b5c8'>
>           <member-type access='public'>
>-            <typedef-decl name='rebind_alloc&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; &gt;' type-id='f1efd708' filepath='external/libcxx/include/memory' line='1535' column='1' id='0f0d7731'/>
>+            <typedef-decl name='type' type-id='ad4706fb' filepath='external/libcxx/include/type_traits' line='429' column='1' id='cc6db4eb'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__pointer_type&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='f5b2587a'>
>+        <class-decl name='__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt;' size-in-bits='4800' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='95' column='1' id='c67da3ae'>
>+          <base-class access='public' layout-offset-in-bits='0' type-id='8a3fab4b'/>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='6d73632a' filepath='external/libcxx/include/memory' line='1031' column='1' id='3d28dad9'/>
>+            <typedef-decl name='__node_value_type' type-id='21a2c439' filepath='external/libcxx/include/__hash_table' line='101' column='1' id='2a933c08'/>
>           </member-type>
>+          <data-member access='public' layout-offset-in-bits='32'>
>+            <var-decl name='__hash_' type-id='b59d7dce' visibility='default' filepath='external/libcxx/include/__hash_table' line='103' column='1'/>
>+          </data-member>
>+          <data-member access='public' layout-offset-in-bits='64'>
>+            <var-decl name='__value_' type-id='2a933c08' visibility='default' filepath='external/libcxx/include/__hash_table' line='104' column='1'/>
>+          </data-member>
>         </class-decl>
>-        <class-decl name='allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='eaedaeb4'>
>+        <class-decl name='__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;' size-in-bits='4736' is-struct='yes' visibility='default' filepath='external/libcxx/include/unordered_map' line='628' column='1' id='21a2c439'>
>+          <member-type access='public'>
>+            <typedef-decl name='value_type' type-id='e0bee049' filepath='external/libcxx/include/unordered_map' line='632' column='1' id='4355225c'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='__nc_ref_pair_type' type-id='3bad31be' filepath='external/libcxx/include/unordered_map' line='633' column='1' id='b0b75e27'/>
>+          </member-type>
>+          <member-type access='public'>
>+            <typedef-decl name='__nc_rref_pair_type' type-id='c98c9c82' filepath='external/libcxx/include/unordered_map' line='634' column='1' id='515a692d'/>
>+          </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__cc' type-id='4355225c' visibility='default' filepath='external/libcxx/include/unordered_map' line='637' column='1'/>
>+          </data-member>
>+          <member-function access='private'>
>+            <function-decl name='__hash_value_type' filepath='external/libcxx/include/unordered_map' line='703' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='eb6ff061' is-artificial='yes'/>
>+              <parameter type-id='e9fc9640'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='private'>
>+            <function-decl name='__hash_value_type' filepath='external/libcxx/include/unordered_map' line='704' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='eb6ff061' is-artificial='yes'/>
>+              <parameter type-id='882dae49'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='private' destructor='yes'>
>+            <function-decl name='~__hash_value_type' filepath='external/libcxx/include/unordered_map' line='708' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='eb6ff061' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;' size-in-bits='4736' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='315' column='1' id='e0bee049'>
>+          <data-member access='public' layout-offset-in-bits='0'>
>+            <var-decl name='first' type-id='59d71b0f' visibility='default' filepath='external/libcxx/include/utility' line='323' column='1'/>
>+          </data-member>
>+          <data-member access='public' layout-offset-in-bits='64'>
>+            <var-decl name='second' type-id='d684da9f' visibility='default' filepath='external/libcxx/include/utility' line='324' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='pair' filepath='external/libcxx/include/utility' line='327' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='672fb3d1' is-artificial='yes'/>
>+              <parameter type-id='2762005a'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='pair' filepath='external/libcxx/include/utility' line='328' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='672fb3d1' is-artificial='yes'/>
>+              <parameter type-id='c70e5799'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='__vector_base&lt;unsigned char, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='326' column='1' id='d5b8afe1'>
>+          <base-class access='protected' layout-offset-in-bits='0' type-id='2328d49c'/>
>           <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='eb6ff061' filepath='external/libcxx/include/memory' line='1786' column='1' id='13346654'/>
>+            <typedef-decl name='pointer' type-id='dce739de' filepath='external/libcxx/include/vector' line='338' column='1' id='c59bbd7f'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='reference' type-id='e76fea15' filepath='external/libcxx/include/memory' line='1788' column='1' id='519a2734'/>
>+            <typedef-decl name='allocator_type' type-id='28ac9f25' filepath='external/libcxx/include/vector' line='330' column='1' id='5f3c1b08'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='f5fca924' filepath='external/libcxx/include/memory' line='1787' column='1' id='cccb53e4'/>
>+            <typedef-decl name='size_type' type-id='a7119125' filepath='external/libcxx/include/vector' line='332' column='1' id='26dd3530'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='e9fc9640' filepath='external/libcxx/include/memory' line='1789' column='1' id='23fbdd24'/>
>+            <typedef-decl name='const_reference' type-id='fd9e4c12' filepath='external/libcxx/include/vector' line='336' column='1' id='8b583b33'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='d78a1b2b'/>
>+            <typedef-decl name='value_type' type-id='002ac4a6' filepath='external/libcxx/include/vector' line='334' column='1' id='24661bb0'/>
>           </member-type>
>           <member-type access='private'>
>-            <class-decl name='rebind&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1795' column='1' id='4aa620cf'>
>-              <member-type access='public'>
>-                <typedef-decl name='other' type-id='899220a9' filepath='external/libcxx/include/memory' line='1795' column='1' id='cedcd7cc'/>
>-              </member-type>
>-            </class-decl>
>+            <typedef-decl name='reference' type-id='105a94ff' filepath='external/libcxx/include/vector' line='335' column='1' id='35ba8be3'/>
>           </member-type>
>-          <member-function access='public'>
>-            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='d7caf352' is-artificial='yes'/>
>+          <member-type access='private'>
>+            <typedef-decl name='const_pointer' type-id='1d1e4a52' filepath='external/libcxx/include/vector' line='339' column='1' id='413a012f'/>
>+          </member-type>
>+          <data-member access='protected' layout-offset-in-bits='0'>
>+            <var-decl name='__begin_' type-id='c59bbd7f' visibility='default' filepath='external/libcxx/include/vector' line='343' column='1'/>
>+          </data-member>
>+          <data-member access='protected' layout-offset-in-bits='32'>
>+            <var-decl name='__end_' type-id='c59bbd7f' visibility='default' filepath='external/libcxx/include/vector' line='344' column='1'/>
>+          </data-member>
>+          <data-member access='protected' layout-offset-in-bits='64'>
>+            <var-decl name='__end_cap_' type-id='0dcdf9bc' visibility='default' filepath='external/libcxx/include/vector' line='345' column='1'/>
>+          </data-member>
>+          <member-function access='protected'>
>+            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='361' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='64e46a69' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='protected'>
>+            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='363' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='64e46a69' is-artificial='yes'/>
>+              <parameter type-id='bac98f9a'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='protected'>
>+            <function-decl name='__vector_base' filepath='external/libcxx/include/vector' line='365' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='64e46a69' is-artificial='yes'/>
>+              <parameter type-id='fef2702b'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='protected' destructor='yes'>
>+            <function-decl name='~__vector_base' mangled-name='_ZNSt3__113__vector_baseIhNS_9allocatorIhEEED2Ev' filepath='external/libcxx/include/vector' line='367' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='64e46a69' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__size_type&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='1d01f1bb'>
>+        <class-decl name='allocator_traits&lt;std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1512' column='1' id='ff9e45a2'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='d78a1b2b' filepath='external/libcxx/include/memory' line='1171' column='1' id='034ebaec'/>
>+            <typedef-decl name='pointer' type-id='ffcac889' filepath='external/libcxx/include/memory' line='1517' column='1' id='dce739de'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='__const_void_pointer&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; *, std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='2088546f'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='74d63670' filepath='external/libcxx/include/memory' line='1097' column='1' id='b01256e0'/>
>+            <typedef-decl name='allocator_type' type-id='28ac9f25' filepath='external/libcxx/include/memory' line='1514' column='1' id='9397db6b'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='pointer_traits&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='38a2492e'>
>           <member-type access='public'>
>-            <typedef-decl name='pointer' type-id='eb6ff061' filepath='external/libcxx/include/memory' line='974' column='1' id='2fa2cc8e'/>
>+            <typedef-decl name='size_type' type-id='8901831f' filepath='external/libcxx/include/memory' line='1523' column='1' id='a7119125'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='74d63670'/>
>+            <typedef-decl name='const_void_pointer' type-id='228e3758' filepath='external/libcxx/include/memory' line='1520' column='1' id='01330bc9'/>
>           </member-type>
>           <member-type access='public'>
>-            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='743470d7'/>
>+            <typedef-decl name='const_pointer' type-id='c5323fa3' filepath='external/libcxx/include/memory' line='1518' column='1' id='1d1e4a52'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; *&gt;::__nat, std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='f71f930c'>
>+        <class-decl name='__pointer_type&lt;unsigned char, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='4f2cbfc0'>
>           <member-type access='public'>
>-            <typedef-decl name='type' type-id='21a2c439' filepath='external/libcxx/include/type_traits' line='431' column='1' id='db3cdb25'/>
>+            <typedef-decl name='type' type-id='d119eda0' filepath='external/libcxx/include/memory' line='1031' column='1' id='ffcac889'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__allocator_traits_rebind&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1280' column='1' id='c39d7389'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='cedcd7cc' filepath='external/libcxx/include/memory' line='1282' column='1' id='f1efd708'/>
>+        <class-decl name='allocator&lt;unsigned char&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='28ac9f25'>
>+          <member-type access='private'>
>+            <typedef-decl name='pointer' type-id='cf536864' filepath='external/libcxx/include/memory' line='1786' column='1' id='846a684d'/>
>           </member-type>
>-        </class-decl>
>-        <class-decl name='__rebind_alloc_helper&lt;std::__1::allocator_traits&lt;std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1769' column='1' id='676c0ddb'>
>-          <member-type access='public'>
>-            <typedef-decl name='type' type-id='0f0d7731' filepath='external/libcxx/include/memory' line='1772' column='1' id='6e3b05fe'/>
>+          <member-type access='private'>
>+            <typedef-decl name='reference' type-id='c3535580' filepath='external/libcxx/include/memory' line='1788' column='1' id='8cf6f1b9'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='const_pointer' type-id='354f7eb9' filepath='external/libcxx/include/memory' line='1787' column='1' id='dc029499'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='const_reference' type-id='414f919d' filepath='external/libcxx/include/memory' line='1789' column='1' id='24f7e9d5'/>
>+          </member-type>
>+          <member-type access='private'>
>+            <typedef-decl name='size_type' type-id='b59d7dce' filepath='external/libcxx/include/memory' line='1784' column='1' id='0b1ca1b6'/>
>           </member-type>
>+          <member-function access='public'>
>+            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c0b42655' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>         </class-decl>
>-        <class-decl name='__hash_node_types&lt;std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; *, std::__1::__hash_node&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='227' column='1' id='c4a84210'>
>-          <base-class access='public' layout-offset-in-bits='0' type-id='8beb8d05'/>
>-          <base-class access='public' layout-offset-in-bits='0' type-id='5446a864'/>
>+        <class-decl name='__size_type&lt;std::__1::allocator&lt;unsigned char&gt;, int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1169' column='1' id='0c0bc9da'>
>           <member-type access='public'>
>-            <typedef-decl name='__next_pointer' type-id='f0c35ac7' filepath='external/libcxx/include/__hash_table' line='246' column='1' id='4922730c'/>
>+            <typedef-decl name='type' type-id='0b1ca1b6' filepath='external/libcxx/include/memory' line='1171' column='1' id='8901831f'/>
>           </member-type>
>+        </class-decl>
>+        <class-decl name='__const_void_pointer&lt;unsigned char *, std::__1::allocator&lt;unsigned char&gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1094' column='1' id='4c328bb5'>
>           <member-type access='public'>
>-            <typedef-decl name='__node_pointer' type-id='f132d3c4' filepath='external/libcxx/include/__hash_table' line='240' column='1' id='e54a60cd'/>
>+            <typedef-decl name='type' type-id='7d00dc99' filepath='external/libcxx/include/memory' line='1097' column='1' id='228e3758'/>
>           </member-type>
>         </class-decl>
>-        <class-decl name='__hash_key_value_types&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='168' column='1' id='8beb8d05'>
>+        <class-decl name='pointer_traits&lt;unsigned char *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='972' column='1' id='7be7a313'>
>           <member-type access='public'>
>-            <typedef-decl name='key_type' type-id='3d05d53e' filepath='external/libcxx/include/__hash_table' line='169' column='1' id='c5e85950'/>
>+            <typedef-decl name='pointer' type-id='cf536864' filepath='external/libcxx/include/memory' line='974' column='1' id='f51c2021'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='__container_value_type' type-id='e0bee049' filepath='external/libcxx/include/__hash_table' line='172' column='1' id='ae15c6d0'/>
>+            <typedef-decl name='rebind&lt;const void&gt;' type-id='eaa32e2f' filepath='external/libcxx/include/memory' line='979' column='1' id='7d00dc99'/>
>           </member-type>
>           <member-type access='public'>
>-            <typedef-decl name='__node_value_type' type-id='21a2c439' filepath='external/libcxx/include/__hash_table' line='171' column='1' id='02f7e509'/>
>+            <class-decl name='__nat' is-struct='yes' visibility='default' is-declaration-only='yes' id='5991ae90'/>
>           </member-type>
>-          <data-member access='public' static='yes'>
>-            <var-decl name='__is_map' type-id='4ab96a04' visibility='default' filepath='external/libcxx/include/__hash_table' line='174' column='1'/>
>-          </data-member>
>         </class-decl>
>-        <class-decl name='__hash_map_pointer_types&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt;, void *, std::__1::__hash_key_value_types&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__hash_table' line='215' column='1' id='5446a864'/>
>-        <class-decl name='allocator&lt;std::__1::pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/memory' line='1781' column='1' id='c6fe9052'>
>-          <member-type access='private'>
>-            <typedef-decl name='pointer' type-id='672fb3d1' filepath='external/libcxx/include/memory' line='1786' column='1' id='4b7be444'/>
>+        <class-decl name='conditional&lt;false, std::__1::pointer_traits&lt;unsigned char *&gt;::__nat, unsigned char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/type_traits' line='431' column='1' id='e7caa1da'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='002ac4a6' filepath='external/libcxx/include/type_traits' line='431' column='1' id='111109fd'/>
>           </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='reference' type-id='632fad85' filepath='external/libcxx/include/memory' line='1788' column='1' id='6093d384'/>
>+        </class-decl>
>+        <class-decl name='__const_pointer&lt;unsigned char, unsigned char *, std::__1::allocator&lt;unsigned char&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1042' column='1' id='6a147670'>
>+          <member-type access='public'>
>+            <typedef-decl name='type' type-id='dc029499' filepath='external/libcxx/include/memory' line='1044' column='1' id='c5323fa3'/>
>           </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_pointer' type-id='1b61ed76' filepath='external/libcxx/include/memory' line='1787' column='1' id='767d6c74'/>
>+        </class-decl>
>+        <class-decl name='__compressed_pair&lt;unsigned char *, std::__1::allocator&lt;unsigned char&gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2211' column='1' id='0dcdf9bc'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='6154d891'/>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='69cf5b58'/>
>+        </class-decl>
>+        <class-decl name='__compressed_pair_elem&lt;std::__1::allocator&lt;unsigned char&gt;, 1, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2172' column='1' id='69cf5b58'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='28ac9f25'/>
>+          <member-type access='public'>
>+            <typedef-decl name='reference' type-id='c4b42ca1' filepath='external/libcxx/include/memory' line='2174' column='1' id='426d3488'/>
>           </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='const_reference' type-id='2762005a' filepath='external/libcxx/include/memory' line='1789' column='1' id='e27eed54'/>
>+          <member-type access='public'>
>+            <typedef-decl name='const_reference' type-id='98a103fa' filepath='external/libcxx/include/memory' line='2175' column='1' id='59dc0248'/>
>           </member-type>
>           <member-function access='public'>
>-            <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='399c53a0' is-artificial='yes'/>
>+            <function-decl name='__compressed_pair_elem' filepath='external/libcxx/include/memory' line='2179' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='e8fe63ee' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <typedef-decl name='__map_node_handle&lt;std::__1::unordered_map&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState, android::SurfaceComposerClient::SCHash, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, std::__1::allocator&lt;std::__1::pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;::__node, std::__1::unordered_map&lt;android::sp&lt;android::SurfaceControl&gt;, android::ComposerState, android::SurfaceComposerClient::SCHash, std::__1::equal_to&lt;android::sp&lt;android::SurfaceControl&gt; &gt;, std::__1::allocator&lt;std::__1::pair&lt;const android::sp&lt;android::SurfaceControl&gt;, android::ComposerState&gt; &gt; &gt;::allocator_type&gt;' type-id='52e6d633' filepath='external/libcxx/include/__node_handle' line='193' column='1' id='cd19729a'/>
>-        <class-decl name='unordered_map&lt;android::sp&lt;android::ITransactionCompletedListener&gt;, android::SurfaceComposerClient::CallbackInfo, android::SurfaceComposerClient::TCLHash, std::__1::equal_to&lt;android::sp&lt;android::ITransactionCompletedListener&gt; &gt;, std::__1::allocator&lt;std::__1::pair&lt;const android::sp&lt;android::ITransactionCompletedListener&gt;, android::SurfaceComposerClient::CallbackInfo&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/unordered_map' line='842' column='1' id='cfea5fb3'>
>-          <member-type access='private'>
>-            <typedef-decl name='__table' type-id='13276011' filepath='external/libcxx/include/unordered_map' line='866' column='1' id='7d6cb1ca'/>
>-          </member-type>
>+        <class-decl name='unique_ptr&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::default_delete&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/memory' line='2401' column='1' id='ee11ffd6'>
>           <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='cb0b44b0' filepath='external/libcxx/include/unordered_map' line='885' column='1' id='23c8f2ca'/>
>+            <typedef-decl name='pointer' type-id='538091a9' filepath='external/libcxx/include/memory' line='2405' column='1' id='0136fab8'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='hasher' type-id='10fccd79' filepath='external/libcxx/include/unordered_map' line='848' column='1' id='ccb92327'/>
>+            <typedef-decl name='deleter_type' type-id='523e1257' filepath='external/libcxx/include/memory' line='2404' column='1' id='87233a23'/>
>           </member-type>
>+          <data-member access='private' layout-offset-in-bits='0'>
>+            <var-decl name='__ptr_' type-id='dc8bc990' visibility='default' filepath='external/libcxx/include/memory' line='2411' column='1'/>
>+          </data-member>
>+          <member-function access='public'>
>+            <function-decl name='unique_ptr' filepath='external/libcxx/include/memory' line='2494' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='7d0d8c7c' is-artificial='yes'/>
>+              <parameter type-id='165e4caa'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public' destructor='yes'>
>+            <function-decl name='~unique_ptr' mangled-name='_ZNSt3__110unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS6_EEED2Ev' filepath='external/libcxx/include/memory' line='2606' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='7d0d8c7c' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+          <member-function access='public'>
>+            <function-decl name='unique_ptr&lt;true, void&gt;' mangled-name='_ZNSt3__110unique_ptrINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_14default_deleteIS6_EEEC2ILb1EvEEv' filepath='external/libcxx/include/memory' line='2461' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='7d0d8c7c' is-artificial='yes'/>
>+              <return type-id='48b5725f'/>
>+            </function-decl>
>+          </member-function>
>+        </class-decl>
>+        <class-decl name='vector&lt;long long, std::__1::allocator&lt;long long&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='470' column='1' id='1e253049'>
>+          <base-class access='private' layout-offset-in-bits='0' type-id='721e3983'/>
>           <member-type access='private'>
>-            <typedef-decl name='key_equal' type-id='21aee6aa' filepath='external/libcxx/include/unordered_map' line='849' column='1' id='8aa749b8'/>
>+            <typedef-decl name='allocator_type' type-id='f4b76f72' filepath='external/libcxx/include/vector' line='479' column='1' id='3b3f6d46'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='ba2ab536' filepath='external/libcxx/include/unordered_map' line='850' column='1' id='173885ee'/>
>+            <typedef-decl name='size_type' type-id='f3dbad4e' filepath='external/libcxx/include/vector' line='483' column='1' id='48b8e292'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='eb413241' filepath='external/libcxx/include/unordered_map' line='888' column='1' id='e12aaf4a'/>
>+            <typedef-decl name='value_type' type-id='1eb56b1e' filepath='external/libcxx/include/vector' line='478' column='1' id='7f6e0a92'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='2fd7d0e5' filepath='external/libcxx/include/unordered_map' line='889' column='1' id='1651b07e'/>
>+            <typedef-decl name='const_reference' type-id='cc0c668d' filepath='external/libcxx/include/vector' line='482' column='1' id='5d912f41'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='4a8452bb' filepath='external/libcxx/include/unordered_map' line='851' column='1' id='99ea45ca'/>
>+            <typedef-decl name='iterator' type-id='efded478' filepath='external/libcxx/include/vector' line='487' column='1' id='99bfba62'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='key_type' type-id='ae56e550' filepath='external/libcxx/include/unordered_map' line='846' column='1' id='a4c3ab88'/>
>+            <typedef-decl name='const_iterator' type-id='2d3a5701' filepath='external/libcxx/include/vector' line='488' column='1' id='9aea7a46'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='insert_return_type' type-id='db46f8aa' filepath='external/libcxx/include/unordered_map' line='895' column='1' id='ed8910bd'/>
>+            <typedef-decl name='reverse_iterator' type-id='bab30871' filepath='external/libcxx/include/vector' line='489' column='1' id='a8d2cb89'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='node_type' type-id='7cd76230' filepath='external/libcxx/include/unordered_map' line='894' column='1' id='133fc321'/>
>+            <typedef-decl name='const_reverse_iterator' type-id='0a83870c' filepath='external/libcxx/include/vector' line='490' column='1' id='0d624ef5'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='mapped_type' type-id='44fcc575' filepath='external/libcxx/include/unordered_map' line='847' column='1' id='724a1d1c'/>
>+            <typedef-decl name='reference' type-id='959ee201' filepath='external/libcxx/include/vector' line='481' column='1' id='642663f5'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='local_iterator' type-id='9450f971' filepath='external/libcxx/include/unordered_map' line='890' column='1' id='ac03cae6'/>
>+            <typedef-decl name='pointer' type-id='2a5e9835' filepath='external/libcxx/include/vector' line='485' column='1' id='81c398b9'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_local_iterator' type-id='08e61eb5' filepath='external/libcxx/include/unordered_map' line='891' column='1' id='f31dcbfa'/>
>+            <typedef-decl name='const_pointer' type-id='0518e5f1' filepath='external/libcxx/include/vector' line='486' column='1' id='d986b775'/>
>           </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__table_' type-id='7d6cb1ca' visibility='default' filepath='external/libcxx/include/unordered_map' line='868' column='1'/>
>-          </data-member>
>-          <member-function access='public'>
>-            <function-decl name='unordered_map' mangled-name='_ZNSt3__113unordered_mapIN7android2spINS1_29ITransactionCompletedListenerEEENS1_21SurfaceComposerClient12CallbackInfoENS5_7TCLHashENS_8equal_toIS4_EENS_9allocatorINS_4pairIKS4_S6_EEEEEC2Ev' filepath='external/libcxx/include/unordered_map' line='904' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='911' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='4deed6e3'/>
>-              <parameter type-id='eaf045ea'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='913' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='4deed6e3'/>
>-              <parameter type-id='eaf045ea'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='496' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='928' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='502' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='8ece3cf0'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='929' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='a6d13996'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='514' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='48b8e292'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='930' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='a6d13996'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='516' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='48b8e292'/>
>+              <parameter type-id='8ece3cf0'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='933' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='bc882813'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='518' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='48b8e292'/>
>+              <parameter type-id='cf9f4eec'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='935' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='bc882813'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='519' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='48b8e292'/>
>+              <parameter type-id='cf9f4eec'/>
>+              <parameter type-id='8ece3cf0'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>-          <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='936' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='a62b8121'/>
>+          <member-function access='public' destructor='yes'>
>+            <function-decl name='~vector' filepath='external/libcxx/include/vector' line='550' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='937' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='a62b8121'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='4deed6e3'/>
>-              <parameter type-id='eaf045ea'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='558' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='7707f03e'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='939' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='a62b8121'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='4deed6e3'/>
>-              <parameter type-id='eaf045ea'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='559' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='7707f03e'/>
>+              <parameter type-id='8ece3cf0'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='945' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='565' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='b5ce4ba7'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='948' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='4deed6e3'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='568' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='b5ce4ba7'/>
>+              <parameter type-id='8ece3cf0'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='960' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='a62b8121'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='571' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='cd9bbdb9'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>           <member-function access='public'>
>-            <function-decl name='unordered_map' filepath='external/libcxx/include/unordered_map' line='963' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='9fa93cc3' is-artificial='yes'/>
>-              <parameter type-id='a62b8121'/>
>-              <parameter type-id='23c8f2ca'/>
>-              <parameter type-id='4deed6e3'/>
>-              <parameter type-id='bd8fe268'/>
>+            <function-decl name='vector' filepath='external/libcxx/include/vector' line='579' column='1' visibility='default' binding='global' size-in-bits='32'>
>+              <parameter type-id='c96d0971' is-artificial='yes'/>
>+              <parameter type-id='cd9bbdb9'/>
>+              <parameter type-id='8ece3cf0'/>
>               <return type-id='48b5725f'/>
>             </function-decl>
>           </member-function>
>         </class-decl>
>-        <class-decl name='__hash_table&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::ITransactionCompletedListener&gt;, android::SurfaceComposerClient::CallbackInfo&gt;, std::__1::__unordered_map_hasher&lt;android::sp&lt;android::ITransactionCompletedListener&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::ITransactionCompletedListener&gt;, android::SurfaceComposerClient::CallbackInfo&gt;, android::SurfaceComposerClient::TCLHash, true&gt;, std::__1::__unordered_map_equal&lt;android::sp&lt;android::ITransactionCompletedListener&gt;, std::__1::__hash_value_type&lt;android::sp&lt;android::ITransactionCompletedListener&gt;, android::SurfaceComposerClient::CallbackInfo&gt;, std::__1::equal_to&lt;android::sp&lt;android::ITransactionCompletedListener&gt; &gt;, true&gt;, std::__1::allocator&lt;std::__1::__hash_value_type&lt;android::sp&lt;android::ITransactionCompletedListener&gt;, android::SurfaceComposerClient::CallbackInfo&gt; &gt; &gt;' size-in-bits='160' visibility='default' filepath='external/libcxx/include/__hash_table' line='893' column='1' id='13276011'>
>-          <member-type access='private'>
>-            <typedef-decl name='__bucket_list' type-id='34c04fc2' filepath='external/libcxx/include/__hash_table' line='950' column='1' id='a1c90f1f'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='size_type' type-id='82deaed2' filepath='external/libcxx/include/__hash_table' line='916' column='1' id='cb0b44b0'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='hasher' type-id='44c8fbc1' filepath='external/libcxx/include/__hash_table' line='897' column='1' id='dea6da2d'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='key_equal' type-id='b9b7bacb' filepath='external/libcxx/include/__hash_table' line='898' column='1' id='4546583a'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='__node_allocator' type-id='75992ea0' filepath='external/libcxx/include/__hash_table' line='925' column='1' id='1630ae32'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='allocator_type' type-id='9997173c' filepath='external/libcxx/include/__hash_table' line='899' column='1' id='511e6988'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='__next_pointer' type-id='c2762002' filepath='external/libcxx/include/__hash_table' line='932' column='1' id='4e3d5827'/>
>-          </member-type>
>-          <member-type access='private'>
>-            <typedef-decl name='value_type' type-id='16b5f8eb' filepath='external/libcxx/include/__hash_table' line='896' column='1' id='18e88230'/>
>-          </member-type>
>+        <class-decl name='__vector_base&lt;long long, std::__1::allocator&lt;long long&gt; &gt;' size-in-bits='96' visibility='default' filepath='external/libcxx/include/vector' line='326' column='1' id='721e3983'>
>+          <base-class access='protected' layout-offset-in-bits='0' type-id='2328d49c'/>
>           <member-type access='private'>
>-            <typedef-decl name='__node_pointer' type-id='618afb67' filepath='external/libcxx/include/__hash_table' line='928' column='1' id='c011594a'/>
>+            <typedef-decl name='pointer' type-id='09332c13' filepath='external/libcxx/include/vector' line='338' column='1' id='2a5e9835'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='iterator' type-id='d23fc447' filepath='external/libcxx/include/__hash_table' line='989' column='1' id='7d3bbd4c'/>
>+            <typedef-decl name='allocator_type' type-id='f4b76f72' filepath='external/libcxx/include/vector' line='330' column='1' id='db3653aa'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_iterator' type-id='e71c70e7' filepath='external/libcxx/include/__hash_table' line='990' column='1' id='9a15a67c'/>
>+            <typedef-decl name='size_type' type-id='e9b1f164' filepath='external/libcxx/include/vector' line='332' column='1' id='f3dbad4e'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='__container_value_type' type-id='604ccd48' filepath='external/libcxx/include/__hash_table' line='909' column='1' id='daec68b6'/>
>+            <typedef-decl name='const_reference' type-id='e52b4c68' filepath='external/libcxx/include/vector' line='336' column='1' id='cc0c668d'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='__node_holder' type-id='95a6db49' filepath='external/libcxx/include/__hash_table' line='1232' column='1' id='00b6202f'/>
>+            <typedef-decl name='value_type' type-id='1eb56b1e' filepath='external/libcxx/include/vector' line='334' column='1' id='84efd30e'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='local_iterator' type-id='26d52297' filepath='external/libcxx/include/__hash_table' line='991' column='1' id='78df1b7c'/>
>+            <typedef-decl name='reference' type-id='c46fd041' filepath='external/libcxx/include/vector' line='335' column='1' id='959ee201'/>
>           </member-type>
>           <member-type access='private'>
>-            <typedef-decl name='const_local_iterator' type-id='230886f7' filepath='external/libcxx/include/__hash_table' line='992' column='1' id='b7a7db0c'/>
>+            <typedef-decl name='const_pointer' type-id='ecfffc93' filepath='external/libcxx/include/vector' line='339' column='1' id='0518e5f1'/>
>           </member-type>
>-          <data-member access='private' layout-offset-in-bits='0'>
>-            <var-decl name='__bucket_list_' type-id='a1c90f1f' visibility='default' filepath='external/libcxx/include/__hash_table' line='955' column='1'/>
>-          </data-member>
>-          <data-member access='private' layout-offset-in-bits='64'>
>-            <var-decl name='__p1_' type-id='036a8097' visibility='default' filepath='external/libcxx/include/__hash_table' line='956' column='1'/>
>+          <data-member access='protected' layout-offset-in-bits='0'>
>+            <var-decl name='__begin_' type-id='2a5e9835' visibility='default' filepath='external/libcxx/include/vector' line='343' column='1'/>
>           </data-member>
>-          <data-member access='private' layout-offset-in-bits='96'>
>-            <var-decl name='__p2_' type-id='1486f60b' visibility='default' filepath='external/libcxx/include/__hash_table' line='957' column='1'/>
>+          <data-member access='protected' layout-offset-in-bits='32'>
>+            <var-decl name='__end_' type-id='2a5e9835' visibility='default' filepath='external/libcxx/include/vector' line='344' column='1'/>
>           </data-member>
>-          <data-member access='private' layout-offset-in-bits='128'>
>-            <var-decl name='__p3_' type-id='15d473bb' visibility='default' filepath='external/libcxx/include/__hash_table' line='958' column='1'/>
>+          <data-member access='protected' layout-offset-in-bits='64'>
>+            <var-decl name='__end_cap_' type-id='508fa9fe' visibility='default' filepath='external/libcxx/include/vector' line='345' column='1'/>
>           </data-member>
>-          <member-function access='public'>
>-            <function-decl name='__hash_table' mangled-name='_ZNSt3__112__hash_tableINS_17__hash_value_typeIN7android2spINS2_29ITransactionCompletedListenerEEENS2_21SurfaceComposerClient12CallbackInfoEEENS_22__unordered_map_hasherIS5_S8_NS6_7TCLHashELb1EEENS_21__unordered_map_equalIS5_S8_NS_8equal_toIS5_EELb1EEENS_9allocatorIS8_EEEC2Ev' filepath='external/libcxx/include/__hash_table' line='995' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c20091e9' is-artificial='yes'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1003' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c20091e9' is-artificial='yes'/>
>-              <parameter type-id='198e6a01'/>
>-              <parameter type-id='b5551ae4'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1004' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c20091e9' is-artificial='yes'/>
>-              <parameter type-id='198e6a01'/>
>-              <parameter type-id='b5551ae4'/>
>-              <parameter type-id='a7fdf71a'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1006' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c20091e9' is-artificial='yes'/>
>-              <parameter type-id='a7fdf71a'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='__hash_table' filepath='external/libcxx/include/__hash_table' line='1007' column='1' visibility='default' binding='global' size-in-bits='32'>
>-              <parameter type-id='c20091e9' is-artificial='yes'/>
>-              <parameter type-id='c353adfc'/>
>-              <return type-id='48b5725f'/>
>-            </function-decl>
>-          </member-function>
>-          <member-function access='public'>
>-            <function-decl name='__hash_tab